From b3fd06fb4553259fbcdd85a3f0d43e1761c0a82a Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Mon, 14 May 2018 09:52:03 +0200 Subject: [PATCH] Add missing deprecation info in CLI help. --- acme/acme.go | 8 ++++---- configuration/configuration.go | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/acme/acme.go b/acme/acme.go index 805b2b744..f32445aeb 100644 --- a/acme/acme.go +++ b/acme/acme.go @@ -41,15 +41,15 @@ type ACME struct { Email string `description:"Email address used for registration"` Domains []types.Domain `description:"SANs (alternative domains) to each main domain using format: --acme.domains='main.com,san1.com,san2.com' --acme.domains='main.net,san1.net,san2.net'"` Storage string `description:"File or key used for certificates storage."` - StorageFile string // deprecated - OnDemand bool `description:"Enable on demand certificate generation. This will request a certificate from Let's Encrypt during the first TLS handshake for a hostname that does not yet have a certificate."` //deprecated + StorageFile string // Deprecated + OnDemand bool `description:"(Deprecated) Enable on demand certificate generation. This will request a certificate from Let's Encrypt during the first TLS handshake for a hostname that does not yet have a certificate."` //deprecated OnHostRule bool `description:"Enable certificate generation on frontends Host rules."` CAServer string `description:"CA server to use."` EntryPoint string `description:"Entrypoint to proxy acme challenge to."` DNSChallenge *acmeprovider.DNSChallenge `description:"Activate DNS-01 Challenge"` HTTPChallenge *acmeprovider.HTTPChallenge `description:"Activate HTTP-01 Challenge"` - DNSProvider string `description:"Activate DNS-01 Challenge (Deprecated)"` // deprecated - DelayDontCheckDNS flaeg.Duration `description:"Assume DNS propagates after a delay in seconds rather than finding and querying nameservers."` // 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 ACMELogging bool `description:"Enable debug logging of ACME actions."` client *acme.Client defaultCertificate *tls.Certificate diff --git a/configuration/configuration.go b/configuration/configuration.go index 260391822..c21e12b05 100644 --- a/configuration/configuration.go +++ b/configuration/configuration.go @@ -105,13 +105,13 @@ type GlobalConfiguration struct { // WebCompatibility is a configuration to handle compatibility with deprecated web provider options type WebCompatibility struct { - Address string `description:"Web administration port" export:"true"` - CertFile string `description:"SSL certificate" export:"true"` - KeyFile string `description:"SSL certificate" export:"true"` - ReadOnly bool `description:"Enable read only API" export:"true"` - Statistics *types.Statistics `description:"Enable more detailed statistics" export:"true"` - Metrics *types.Metrics `description:"Enable a metrics exporter" export:"true"` - Path string `description:"Root path for dashboard and API" export:"true"` + Address string `description:"(Deprecated) Web administration port" export:"true"` + CertFile string `description:"(Deprecated) SSL certificate" export:"true"` + KeyFile string `description:"(Deprecated) SSL certificate" export:"true"` + ReadOnly bool `description:"(Deprecated) Enable read only API" export:"true"` + Statistics *types.Statistics `description:"(Deprecated) Enable more detailed statistics" export:"true"` + Metrics *types.Metrics `description:"(Deprecated) Enable a metrics exporter" export:"true"` + Path string `description:"(Deprecated) Root path for dashboard and API" export:"true"` Auth *types.Auth `export:"true"` Debug bool `export:"true"` }