Browse Source

caddyfile: make renew_interval option configurable (#4451)

master
Rainer Borene 3 years ago
committed by GitHub
parent
commit
5e5af50e64
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      caddyconfig/httpcaddyfile/options.go
  2. 8
      caddyconfig/httpcaddyfile/tlsapp.go
  3. 2
      caddytest/integration/caddyfile_adapt/global_options_acme.txt

1
caddyconfig/httpcaddyfile/options.go

@ -34,6 +34,7 @@ func init() {
RegisterGlobalOption("order", parseOptOrder) RegisterGlobalOption("order", parseOptOrder)
RegisterGlobalOption("storage", parseOptStorage) RegisterGlobalOption("storage", parseOptStorage)
RegisterGlobalOption("storage_clean_interval", parseOptDuration) RegisterGlobalOption("storage_clean_interval", parseOptDuration)
RegisterGlobalOption("renew_interval", parseOptDuration)
RegisterGlobalOption("acme_ca", parseOptSingleString) RegisterGlobalOption("acme_ca", parseOptSingleString)
RegisterGlobalOption("acme_ca_root", parseOptSingleString) RegisterGlobalOption("acme_ca_root", parseOptSingleString)
RegisterGlobalOption("acme_dns", parseOptACMEDNS) RegisterGlobalOption("acme_dns", parseOptACMEDNS)

8
caddyconfig/httpcaddyfile/tlsapp.go

@ -286,6 +286,14 @@ func (st ServerType) buildTLSApp(
tlsApp.Automation.StorageCleanInterval = storageCleanInterval tlsApp.Automation.StorageCleanInterval = storageCleanInterval
} }
// set the expired certificates renew interval if configured
if renewCheckInterval, ok := options["renew_interval"].(caddy.Duration); ok {
if tlsApp.Automation == nil {
tlsApp.Automation = new(caddytls.AutomationConfig)
}
tlsApp.Automation.RenewCheckInterval = renewCheckInterval
}
// if any hostnames appear on the same server block as a key with // if any hostnames appear on the same server block as a key with
// no host, they will not be used with route matchers because the // no host, they will not be used with route matchers because the
// hostless key matches all hosts, therefore, it wouldn't be // hostless key matches all hosts, therefore, it wouldn't be

2
caddytest/integration/caddyfile_adapt/global_options_acme.txt

@ -21,6 +21,7 @@
burst 20 burst 20
} }
storage_clean_interval 7d storage_clean_interval 7d
renew_interval 1d
key_type ed25519 key_type ed25519
} }
@ -82,6 +83,7 @@
}, },
"ask": "https://example.com" "ask": "https://example.com"
}, },
"renew_interval": 86400000000000,
"storage_clean_interval": 604800000000000 "storage_clean_interval": 604800000000000
} }
} }

Loading…
Cancel
Save