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

Fix HostnamePolicyFile (#1785) 

CA was referencing RA's config.
Also, the FailOnError function needs a non-nil error to fail.

* Bump Godep version.
This commit is contained in:
Jacob Hoffman-Andrews 2016-05-04 08:12:08 -07:00
parent 8ee578c3b7
commit 2c39c684cb
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -1,7 +1,7 @@
{
"ImportPath": "github.com/letsencrypt/boulder",
"GoVersion": "go1.5",
"GodepVersion": "v62",
"GodepVersion": "v63",
"Packages": [
"./..."
],

6
cmd/boulder-ca/main.go
View File

@ -115,10 +115,10 @@ func main() {
pa, err := policy.New(c.PA.Challenges)
cmd.FailOnError(err, "Couldn't create PA")
if c.RA.HostnamePolicyFile == "" {
cmd.FailOnError(nil, "HostnamePolicyFile was empty.")
if c.CA.HostnamePolicyFile == "" {
cmd.FailOnError(fmt.Errorf("HostnamePolicyFile was empty."), "")
}
err = pa.SetHostnamePolicyFile(c.RA.HostnamePolicyFile)
err = pa.SetHostnamePolicyFile(c.CA.HostnamePolicyFile)
cmd.FailOnError(err, "Couldn't load hostname policy file")
issuers, err := loadIssuers(c)

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

@ -6,6 +6,7 @@
package main
import (
"fmt"
"time"
"github.com/jmhodges/clock"
@ -33,7 +34,7 @@ func main() {
cmd.FailOnError(err, "Couldn't create PA")
if c.RA.HostnamePolicyFile == "" {
cmd.FailOnError(nil, "HostnamePolicyFile must be provided.")
cmd.FailOnError(fmt.Errorf("HostnamePolicyFile must be provided."), "")
}
err = pa.SetHostnamePolicyFile(c.RA.HostnamePolicyFile)
cmd.FailOnError(err, "Couldn't load hostname policy file")