From f3a2fd85bcf63ac68be4e08fa37f11bda30c934b Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Thu, 22 Mar 2018 15:43:53 -0400 Subject: [PATCH] Remove deprecated SubscriberAgreementURL config field. (#3587) The outer `config.SubscriberAgreementURL` field has been deprecated for a while in favour of `config.wfe.SubscriberAgreementURL`. After verifying the prod/staging configurations do not use the legacy field this commit removes it. --- cmd/boulder-wfe/main.go | 10 +--------- cmd/boulder-wfe2/main.go | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/cmd/boulder-wfe/main.go b/cmd/boulder-wfe/main.go index 0a9a63920..cbd92cbb0 100644 --- a/cmd/boulder-wfe/main.go +++ b/cmd/boulder-wfe/main.go @@ -45,8 +45,6 @@ type config struct { Features map[string]bool } - SubscriberAgreementURL string - Syslog cmd.SyslogConfig Common struct { @@ -97,13 +95,7 @@ func main() { wfe.RA = rac wfe.SA = sac - // TODO: remove this check once the production config uses the SubscriberAgreementURL in the wfe section - if c.WFE.SubscriberAgreementURL != "" { - wfe.SubscriberAgreementURL = c.WFE.SubscriberAgreementURL - } else { - wfe.SubscriberAgreementURL = c.SubscriberAgreementURL - } - + wfe.SubscriberAgreementURL = c.WFE.SubscriberAgreementURL wfe.AllowOrigins = c.WFE.AllowOrigins wfe.AcceptRevocationReason = c.WFE.AcceptRevocationReason wfe.AllowAuthzDeactivation = c.WFE.AllowAuthzDeactivation diff --git a/cmd/boulder-wfe2/main.go b/cmd/boulder-wfe2/main.go index 14563c046..e7693f0f6 100644 --- a/cmd/boulder-wfe2/main.go +++ b/cmd/boulder-wfe2/main.go @@ -54,8 +54,6 @@ type config struct { Features map[string]bool } - SubscriberAgreementURL string - Syslog cmd.SyslogConfig Common struct { @@ -209,13 +207,7 @@ func main() { wfe.RA = rac wfe.SA = sac - // TODO: remove this check once the production config uses the SubscriberAgreementURL in the wfe section - if c.WFE.SubscriberAgreementURL != "" { - wfe.SubscriberAgreementURL = c.WFE.SubscriberAgreementURL - } else { - wfe.SubscriberAgreementURL = c.SubscriberAgreementURL - } - + wfe.SubscriberAgreementURL = c.WFE.SubscriberAgreementURL wfe.AllowOrigins = c.WFE.AllowOrigins wfe.AcceptRevocationReason = c.WFE.AcceptRevocationReason wfe.AllowAuthzDeactivation = c.WFE.AllowAuthzDeactivation