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

Merge pull request #516 from letsencrypt/dns-config-refactor 

DNS config refactoring
This commit is contained in:
Jacob Hoffman-Andrews 2015-07-24 12:57:28 -07:00
parent 8092b42dd6 f93fbd4366
commit ec8d37eb21
7 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/boulder-ra/main.go
View File

@ -39,9 +39,9 @@ func main() {
rai := ra.NewRegistrationAuthorityImpl()
rai.AuthzBase = c.Common.BaseURL + wfe.AuthzPath
rai.MaxKeySize = c.Common.MaxKeySize
raDNSTimeout, err := time.ParseDuration(c.RA.DNSTimeout)
raDNSTimeout, err := time.ParseDuration(c.Common.DNSTimeout)
cmd.FailOnError(err, "Couldn't parse RA DNS timeout")
rai.DNSResolver = core.NewDNSResolverImpl(raDNSTimeout, []string{c.RA.DNSResolver})
rai.DNSResolver = core.NewDNSResolverImpl(raDNSTimeout, []string{c.Common.DNSResolver})
go cmd.ProfileCmd("RA", stats)

4
cmd/boulder-va/main.go
View File

@ -38,9 +38,9 @@ func main() {
go cmd.ProfileCmd("VA", stats)
vai := va.NewValidationAuthorityImpl(c.CA.TestMode)
dnsTimeout, err := time.ParseDuration(c.VA.DNSTimeout)
dnsTimeout, err := time.ParseDuration(c.Common.DNSTimeout)
cmd.FailOnError(err, "Couldn't parse DNS timeout")
vai.DNSResolver = core.NewDNSResolverImpl(dnsTimeout, []string{c.VA.DNSResolver})
vai.DNSResolver = core.NewDNSResolverImpl(dnsTimeout, []string{c.Common.DNSResolver})
vai.UserAgent = c.VA.UserAgent
for {

11
cmd/boulder/main.go
View File

@ -91,15 +91,16 @@ func main() {
wfei.IssuerCacheDuration, err = time.ParseDuration(c.WFE.IssuerCacheDuration)
cmd.FailOnError(err, "Couldn't parse issuer caching duration")
dnsTimeout, err := time.ParseDuration(c.Common.DNSTimeout)
cmd.FailOnError(err, "Couldn't parse DNS timeout")
dnsResolver := core.NewDNSResolverImpl(dnsTimeout, []string{c.Common.DNSResolver})
ra := ra.NewRegistrationAuthorityImpl()
raDNSTimeout, err := time.ParseDuration(c.RA.DNSTimeout)
cmd.FailOnError(err, "Couldn't parse RA DNS timeout")
ra.DNSResolver = core.NewDNSResolverImpl(raDNSTimeout, []string{c.RA.DNSResolver})
ra.DNSResolver = dnsResolver
va := va.NewValidationAuthorityImpl(c.CA.TestMode)
vaDNSTimeout, err := time.ParseDuration(c.VA.DNSTimeout)
cmd.FailOnError(err, "Couldn't parse VA DNS timeout")
va.DNSResolver = core.NewDNSResolverImpl(vaDNSTimeout, []string{c.VA.DNSResolver})
va.DNSResolver = dnsResolver
va.UserAgent = c.VA.UserAgent
cadb, err := ca.NewCertificateAuthorityDatabaseImpl(c.CA.DBDriver, c.CA.DBConnect)

10
cmd/shell.go
View File

@ -90,9 +90,6 @@ type Config struct {
}
RA struct {
DNSResolver string
DNSTimeout string
// DebugAddr is the address to run the /debug handlers on.
DebugAddr string
}
@ -106,9 +103,7 @@ type Config struct {
}
VA struct {
DNSResolver string
DNSTimeout string
UserAgent string
UserAgent string
// DebugAddr is the address to run the /debug handlers on.
DebugAddr string
@ -167,6 +162,9 @@ type Config struct {
// Path to a PEM-encoded copy of the issuer certificate.
IssuerCert string
MaxKeySize int
DNSResolver string
DNSTimeout string
}
SubscriberAgreementURL string

8
test/boulder-config.json
View File

@ -114,8 +114,6 @@
},
"ra": {
"dnsResolver": "8.8.8.8:53",
"dnsTimeout": "10s",
"debugAddr": "localhost:8002"
},
@ -126,8 +124,6 @@
},
"va": {
"dnsResolver": "8.8.8.8:53",
"dnsTimeout": "10s",
"userAgent": "boulder",
"debugAddr": "localhost:8004"
},
@ -171,7 +167,9 @@
"common": {
"baseURL": "http://localhost:4000",
"issuerCert": "test/test-ca.pem",
"maxKeySize": 4096
"maxKeySize": 4096,
"dnsResolver": "8.8.8.8:53",
"dnsTimeout": "10s"
},
"subscriberAgreementURL": "http://localhost:4300/terms"

11
test/boulder-pkcs11-example-config.json
View File

@ -101,8 +101,6 @@
},
"ra": {
"dnsResolver": "8.8.8.8:53",
"dnsTimeout": "10s",
"debugAddr": "localhost:8002"
},
@ -112,6 +110,11 @@
"debugAddr": "localhost:8003"
},
"va": {
"userAgent": "boulder",
"debugAddr": "localhost:8004"
},
"sql": {
"SQLDebug": true,
"CreateTables": true
@ -150,7 +153,9 @@
"common": {
"baseURL": "http://localhost:4000",
"issuerCert": "test/test-ca.pem"
"issuerCert": "test/test-ca.pem",
"dnsResolver": "8.8.8.8:53",
"dnsTimeout": "10s"
},
"subscriberAgreementURL": "http://localhost:4000/terms"

8
test/boulder-test-config.json
View File

@ -105,8 +105,6 @@
},
"ra": {
"dnsResolver": "127.0.0.1:8053",
"dnsTimeout": "10s",
"debugAddr": "localhost:8002"
},
@ -117,8 +115,6 @@
},
"va": {
"dnsResolver": "127.0.0.1:8053",
"dnsTimeout": "10s",
"userAgent": "boulder",
"debugAddr": "localhost:8004"
},
@ -138,7 +134,9 @@
"common": {
"baseURL": "http://localhost:4300",
"issuerCert": "test/test-ca.pem",
"maxKeySize": 4096
"maxKeySize": 4096,
"dnsResolver": "127.0.0.1:8053",
"dnsTimeout": "10s"
},
"subscriberAgreementURL": "http://example.com/terms"