summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2019-10-16 15:20:27 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2019-10-16 15:20:27 -0600
commitbce2edd22da8c419f7f4db7bccf719046b4700c7 (patch)
treee7db6c5c752484a2db8370cde75f0545c4d900d4
parenta458544d9f6e6aaf72aeab0454acfa482880d3d6 (diff)
tls: Asynchronous cert management at startup (uses CertMagic v0.8.0)
-rw-r--r--go.mod2
-rw-r--r--go.sum2
-rw-r--r--modules/caddytls/tls.go8
3 files changed, 10 insertions, 2 deletions
diff --git a/go.mod b/go.mod
index 9e188f5..0a66a78 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
github.com/klauspost/compress v1.8.6
github.com/klauspost/cpuid v1.2.1
github.com/lucas-clemente/quic-go v0.12.1
- github.com/mholt/certmagic v0.7.5
+ github.com/mholt/certmagic v0.8.0
github.com/muhammadmuzzammil1998/jsonc v0.0.0-20190906142622-1265e9b150c6
github.com/rs/cors v1.7.0
github.com/russross/blackfriday/v2 v2.0.1
diff --git a/go.sum b/go.sum
index f57967e..3198595 100644
--- a/go.sum
+++ b/go.sum
@@ -172,6 +172,8 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mholt/certmagic v0.8.0 h1:WEQhZ4+ySd2cQz0Gf1iEk6xsUaEmmHe10SZiiKd7BdY=
+github.com/mholt/certmagic v0.8.0/go.mod h1:91uJzK5K8IWtYQqTi5R2tsxV1pCde+wdGfaRaOZi6aQ=
github.com/miekg/dns v1.1.15 h1:CSSIDtllwGLMoA6zjdKnaE6Tx6eVUxQ29LUgGetiDCI=
github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
diff --git a/modules/caddytls/tls.go b/modules/caddytls/tls.go
index cb27a9e..7aa1856 100644
--- a/modules/caddytls/tls.go
+++ b/modules/caddytls/tls.go
@@ -189,7 +189,12 @@ func (t *TLS) Manage(names []string) error {
for _, name := range names {
ap := t.getAutomationPolicyForName(name)
magic := certmagic.New(t.certCache, ap.makeCertMagicConfig(t.ctx))
- err := magic.Manage([]string{name})
+ var err error
+ if ap.ManageSync {
+ err = magic.ManageSync([]string{name})
+ } else {
+ err = magic.ManageAsync(t.ctx.Context, []string{name})
+ }
if err != nil {
return fmt.Errorf("automate: manage %s: %v", name, err)
}
@@ -317,6 +322,7 @@ type AutomationConfig struct {
type AutomationPolicy struct {
Hosts []string `json:"hosts,omitempty"`
ManagementRaw json.RawMessage `json:"management,omitempty"`
+ ManageSync bool `json:"manage_sync,omitempty"`
Management ManagerMaker `json:"-"`
}