baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Enable to override certificates in key-value store when using storeconfig

Browse source
This commit is contained in:
Thomas Fan 2018-05-17 06:32:03 -04:00 committed by Traefiker Bot
parent 68cc826519
commit 4a3b1f3847
3 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
acme/acme.go
View file

@ -52,6 +52,7 @@ type ACME struct {
DNSProvider string `description:"(Deprecated) Activate DNS-01 Challenge"` // Deprecated DNSProvider string `description:"(Deprecated) Activate DNS-01 Challenge"` // Deprecated
DelayDontCheckDNS flaeg.Duration `description:"(Deprecated) Assume DNS propagates after a delay in seconds rather than finding and querying nameservers."` // Deprecated DelayDontCheckDNS flaeg.Duration `description:"(Deprecated) Assume DNS propagates after a delay in seconds rather than finding and querying nameservers."` // Deprecated
ACMELogging bool `description:"Enable debug logging of ACME actions."` ACMELogging bool `description:"Enable debug logging of ACME actions."`
OverrideCertificates bool `description:"Enable to override certificates in key-value store when using storeconfig"`
client *acme.Client client *acme.Client
defaultCertificate *tls.Certificate defaultCertificate *tls.Certificate
store cluster.Store store cluster.Store

5
cmd/storeconfig/storeconfig.go
View file

@ -85,7 +85,11 @@ func Run(kv *staert.KvSource, traefikConfiguration *cmd.TraefikConfiguration) fu
} }
} }
// Check to see if ACME account object is already in kv store
if traefikConfiguration.GlobalConfiguration.ACME.OverrideCertificates {
// Store the ACME Account into the KV Store // Store the ACME Account into the KV Store
// Certificates in KV Store will be overridden
meta := cluster.NewMetadata(account) meta := cluster.NewMetadata(account)
err = meta.Marshall() err = meta.Marshall()
if err != nil { if err != nil {
@ -101,6 +105,7 @@ func Run(kv *staert.KvSource, traefikConfiguration *cmd.TraefikConfiguration) fu
if err != nil { if err != nil {
return err return err
} }
}
// Force to delete storagefile // Force to delete storagefile
return kv.Delete(kv.Prefix + "/acme/storagefile") return kv.Delete(kv.Prefix + "/acme/storagefile")

7
docs/configuration/acme.md
View file

@ -63,6 +63,13 @@ entryPoint = "https"
# #
# acmeLogging = true # acmeLogging = true
# If true, override certificates in key-value store when using storeconfig.
#
# Optional
# Default: false
#
# overrideCertificates = true
# Enable on demand certificate generation. # Enable on demand certificate generation.
# #
# Optional (Deprecated) # Optional (Deprecated)