Fix DBConfig references.

cmd/admin-revoker/main.go

@@ -48,7 +48,7 @@ func setupContext(context *cli.Context) (rpc.RegistrationAuthorityClient, *blog.
 	rac, err := rpc.NewRegistrationAuthorityClient(clientName, amqpConf, stats)
 	cmd.FailOnError(err, "Unable to create CA client")
 
-	dbURL, err := c.Revoker.DBConnect.URL()
+	dbURL, err := c.Revoker.DBConfig.URL()
 	cmd.FailOnError(err, "Couldn't load DB URL")
 	dbMap, err := sa.NewDbMap(dbURL)
 	cmd.FailOnError(err, "Couldn't setup database connection")

cmd/boulder-ca/main.go

@@ -32,7 +32,7 @@ func main() {
 
 		go cmd.DebugServer(c.CA.DebugAddr)
 
-		dbURL, err := c.Revoker.DBConnect.URL()
+		dbURL, err := c.PA.DBConfig.URL()
 		cmd.FailOnError(err, "Couldn't load DB URL")
 		paDbMap, err := sa.NewDbMap(dbURL)
 		cmd.FailOnError(err, "Couldn't connect to policy database")

cmd/boulder-ra/main.go

@@ -31,7 +31,7 @@ func main() {
 
 		go cmd.DebugServer(c.RA.DebugAddr)
 
-		dbURL, err := c.Revoker.DBConnect.URL()
+		dbURL, err := c.PA.DBConfig.URL()
 		cmd.FailOnError(err, "Couldn't load DB URL")
 		paDbMap, err := sa.NewDbMap(dbURL)
 		cmd.FailOnError(err, "Couldn't connect to policy database")

cmd/boulder-sa/main.go

@@ -20,7 +20,7 @@ func main() {
 		saConf := c.SA
 		go cmd.DebugServer(saConf.DebugAddr)
 
-		dbURL, err := c.Revoker.DBConnect.URL()
+		dbURL, err := c.SA.DBConfig.URL()
 		cmd.FailOnError(err, "Couldn't load DB URL")
 		dbMap, err := sa.NewDbMap(dbURL)
 		cmd.FailOnError(err, "Couldn't connect to SA database")

cmd/cert-checker/main.go

@@ -239,14 +239,14 @@ func main() {
 		cmd.FailOnError(c.PA.CheckChallenges(), "Invalid PA configuration")
 		c.PA.SetDefaultChallengesIfEmpty()
 
-		dbURL, err := c.CertChecker.DBConnect.URL()
+		saDbURL, err := c.CertChecker.DBConfig.URL()
 		cmd.FailOnError(err, "Couldn't load DB URL")
-		saDbMap, err := sa.NewDbMap(dbURL)
+		saDbMap, err := sa.NewDbMap(saDbURL)
 		cmd.FailOnError(err, "Could not connect to database")
 
-		dbURL, err := c.PA.DBConnect.URL()
+		paDbURL, err := c.PA.DBConfig.URL()
 		cmd.FailOnError(err, "Couldn't load DB URL")
-		saDbMap, err := sa.NewDbMap(dbURL)
+		paDbMap, err := sa.NewDbMap(paDbURL)
 		cmd.FailOnError(err, "Could not connect to policy database")
 
 		checker := newChecker(saDbMap, paDbMap, clock.Default(), c.PA.EnforcePolicyWhitelist, c.PA.Challenges)

cmd/config.go

@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"strings"
 	"time"
 
 	cfsslConfig "github.com/letsencrypt/boulder/Godeps/_workspace/src/github.com/cloudflare/cfssl/config"
@@ -195,10 +194,11 @@ type DBConfig struct {
 // URL returns the DBConnect URL represented by this DBConfig object, either
 // loading it from disk or returning a default value.
 func (d *DBConfig) URL() (string, error) {
-	if c.DBConnectFile != "" {
+	if d.DBConnectFile != "" {
-		return ioutil.ReadFile(c.DBConnectFile)
+		url, err := ioutil.ReadFile(d.DBConnectFile)
+		return string(url), err
 	}
-	return c.DBConnect, nil
+	return d.DBConnect, nil
 }
 
 // AMQPConfig describes how to connect to AMQP, and how to speak to each of the

cmd/expiration-mailer/main.go

@@ -231,7 +231,7 @@ func main() {
 		go cmd.DebugServer(c.Mailer.DebugAddr)
 
 		// Configure DB
-		dbURL, err := c.Mailer.DBConnect.URL()
+		dbURL, err := c.Mailer.DBConfig.URL()
 		cmd.FailOnError(err, "Couldn't load DB URL")
 		dbMap, err := sa.NewDbMap(dbURL)
 		cmd.FailOnError(err, "Could not connect to database")

cmd/external-cert-importer/main.go

@@ -150,7 +150,7 @@ func main() {
 
 	app.Action = func(c cmd.Config, stats statsd.Statter, auditlogger *blog.AuditLogger) {
 		// Configure DB
-		dbURL, err := c.PA.DBConnect.URL()
+		dbURL, err := c.PA.DBConfig.URL()
 		cmd.FailOnError(err, "Couldn't load DB URL")
 		dbMap, err := sa.NewDbMap(dbURL)
 		cmd.FailOnError(err, "Could not connect to database")

cmd/ocsp-responder/main.go

@@ -153,12 +153,13 @@ func main() {
 		var source cfocsp.Source
 
 		// DBConfig takes precedence over Source, if present.
-		url, err := config.DBConfig.URL()
+		dbConnect, err := config.DBConfig.URL()
 		cmd.FailOnError(err, "Reading DB config")
-		if url == "" {
+		if dbConnect == "" {
-			url, err = url.Parse(config.Source)
+			dbConnect = config.Source
 			cmd.FailOnError(err, fmt.Sprintf("Source was not a URL: %s", config.Source))
 		}
+		url, err := url.Parse(dbConnect)
 
 		if url.Scheme == "mysql+tcp" {
 			auditlogger.Info(fmt.Sprintf("Loading OCSP Database for CA Cert: %s", c.Common.IssuerCert))

cmd/ocsp-updater/main.go

@@ -560,7 +560,7 @@ func main() {
 		go cmd.ProfileCmd("OCSP-Updater", stats)
 
 		// Configure DB
-		dbURL, err := c.Revoker.DBConnect.URL()
+		dbURL, err := c.OCSPUpdater.DBConfig.URL()
 		cmd.FailOnError(err, "Couldn't load DB URL")
 		dbMap, err := sa.NewDbMap(dbURL)
 		cmd.FailOnError(err, "Could not connect to database")

cmd/policy-loader/main.go

@@ -110,7 +110,7 @@ func setupFromContext(context *cli.Context) (*policy.PolicyAuthorityDatabaseImpl
 	err = json.Unmarshal(configJSON, &c)
 	cmd.FailOnError(err, "Couldn't unmarshal configuration object")
 
-	dbURL, err := c.PA.DBConnect.URL()
+	dbURL, err := c.PA.DBConfig.URL()
 	cmd.FailOnError(err, "Couldn't load DB URL")
 	dbMap, err := sa.NewDbMap(dbURL)
 	cmd.FailOnError(err, "Failed to create DB map")