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

Fix DBConfig references.

This commit is contained in:
Jacob Hoffman-Andrews 2015-11-24 16:41:53 -08:00
parent deb57e5157
commit b71a850501
11 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/admin-revoker/main.go
View File

@ -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")

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

@ -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")

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

@ -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")

2
cmd/boulder-sa/main.go
View File

@ -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")

8
cmd/cert-checker/main.go
View File

@ -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)

8
cmd/config.go
View File

@ -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 != "" {
return ioutil.ReadFile(c.DBConnectFile)
if d.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

2
cmd/expiration-mailer/main.go
View File

@ -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")

2
cmd/external-cert-importer/main.go
View File

@ -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")

7
cmd/ocsp-responder/main.go
View File

@ -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 == "" {
url, err = url.Parse(config.Source)
if dbConnect == "" {
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))

2
cmd/ocsp-updater/main.go
View File

@ -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")

2
cmd/policy-loader/main.go
View File

@ -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")