Skip to content

Commit

Permalink
caddyfile: make renew_interval option configurable (#4451)
Browse files Browse the repository at this point in the history
  • Loading branch information
rainerborene committed Nov 28, 2021
1 parent 9ee68c1 commit 5e5af50
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions caddyconfig/httpcaddyfile/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ func init() {
RegisterGlobalOption("order", parseOptOrder)
RegisterGlobalOption("storage", parseOptStorage)
RegisterGlobalOption("storage_clean_interval", parseOptDuration)
RegisterGlobalOption("renew_interval", parseOptDuration)
RegisterGlobalOption("acme_ca", parseOptSingleString)
RegisterGlobalOption("acme_ca_root", parseOptSingleString)
RegisterGlobalOption("acme_dns", parseOptACMEDNS)
Expand Down
8 changes: 8 additions & 0 deletions caddyconfig/httpcaddyfile/tlsapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,14 @@ func (st ServerType) buildTLSApp(
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
// no host, they will not be used with route matchers because the
// hostless key matches all hosts, therefore, it wouldn't be
Expand Down
2 changes: 2 additions & 0 deletions caddytest/integration/caddyfile_adapt/global_options_acme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
burst 20
}
storage_clean_interval 7d
renew_interval 1d

key_type ed25519
}
Expand Down Expand Up @@ -82,6 +83,7 @@
},
"ask": "https://example.com"
},
"renew_interval": 86400000000000,
"storage_clean_interval": 604800000000000
}
}
Expand Down

0 comments on commit 5e5af50

Please sign in to comment.