letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Daniel McCarney 2018-03-22 15:43:53 -04:00 committed by Jacob Hoffman-Andrews
parent 49400f781c
commit f3a2fd85bc
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/boulder-wfe/main.go
View File

@ -45,8 +45,6 @@ type config struct {
Features map[string]bool Features map[string]bool
} }
SubscriberAgreementURL string
Syslog cmd.SyslogConfig Syslog cmd.SyslogConfig
Common struct { Common struct {
@ -97,13 +95,7 @@ func main() {
wfe.RA = rac wfe.RA = rac
wfe.SA = sac 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 wfe.SubscriberAgreementURL = c.WFE.SubscriberAgreementURL
} else {
wfe.SubscriberAgreementURL = c.SubscriberAgreementURL
}
wfe.AllowOrigins = c.WFE.AllowOrigins wfe.AllowOrigins = c.WFE.AllowOrigins
wfe.AcceptRevocationReason = c.WFE.AcceptRevocationReason wfe.AcceptRevocationReason = c.WFE.AcceptRevocationReason
wfe.AllowAuthzDeactivation = c.WFE.AllowAuthzDeactivation wfe.AllowAuthzDeactivation = c.WFE.AllowAuthzDeactivation

8
cmd/boulder-wfe2/main.go
View File

@ -54,8 +54,6 @@ type config struct {
Features map[string]bool Features map[string]bool
} }
SubscriberAgreementURL string
Syslog cmd.SyslogConfig Syslog cmd.SyslogConfig
Common struct { Common struct {
@ -209,13 +207,7 @@ func main() {
wfe.RA = rac wfe.RA = rac
wfe.SA = sac 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 wfe.SubscriberAgreementURL = c.WFE.SubscriberAgreementURL
} else {
wfe.SubscriberAgreementURL = c.SubscriberAgreementURL
}
wfe.AllowOrigins = c.WFE.AllowOrigins wfe.AllowOrigins = c.WFE.AllowOrigins
wfe.AcceptRevocationReason = c.WFE.AcceptRevocationReason wfe.AcceptRevocationReason = c.WFE.AcceptRevocationReason
wfe.AllowAuthzDeactivation = c.WFE.AllowAuthzDeactivation wfe.AllowAuthzDeactivation = c.WFE.AllowAuthzDeactivation