Move subscriberAgreementURL config section into WFE section (#1960)

Moves the `subscriberAgreementURL` from a top-level config variable to the WFE section. The top level configuration is still respected until we can change the prod configs.
This commit is contained in:
Ben Irving 2016-06-22 10:07:25 -07:00 committed by Daniel McCarney
parent a2bb1a541d
commit 3e21d0f27c
3 changed files with 11 additions and 3 deletions

View File

@ -52,7 +52,13 @@ func main() {
rac, sac := setupWFE(c, logger, stats)
wfe.RA = rac
wfe.SA = sac
wfe.SubscriberAgreementURL = c.SubscriberAgreementURL
// 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.AllowOrigins = c.WFE.AllowOrigins

View File

@ -39,6 +39,8 @@ type Config struct {
ShutdownStopTimeout string
ShutdownKillTimeout string
SubscriberAgreementURL string
}
CA CAConfig
@ -192,6 +194,7 @@ type Config struct {
}
AllowedSigningAlgos *AllowedSigningAlgos
// TODO: remove after production configs use SubscriberAgreementURL in the wfe section
SubscriberAgreementURL string
}

View File

@ -19,6 +19,7 @@
"issuerCacheDuration": "48h",
"shutdownStopTimeout": "10s",
"shutdownKillTimeout": "1m",
"subscriberAgreementURL": "http://boulder:4000/terms/v1",
"debugAddr": "localhost:8000",
"amqp": {
"server": "amqp://guest:guest@localhost:5673",
@ -382,8 +383,6 @@
"maxDBConns": 10
},
"subscriberAgreementURL": "http://boulder:4000/terms/v1",
"allowedSigningAlgos": {
"rsa": true,
"ecdsanistp256": true,