Fix merge stompage
This commit is contained in:
parent
b01ee02d35
commit
62ae2efe95
|
@ -159,7 +159,7 @@ func main() {
|
||||||
blog.SetAuditLogger(auditlogger)
|
blog.SetAuditLogger(auditlogger)
|
||||||
|
|
||||||
// Configure DB
|
// Configure DB
|
||||||
dbMap, err := sa.NewDbMap(c.Common.PolicyDB.Driver, c.Common.PolicyDB.Name)
|
dbMap, err := sa.NewDbMap(c.Common.PolicyDBDriver, c.Common.PolicyDBConnect)
|
||||||
cmd.FailOnError(err, "Could not connect to database")
|
cmd.FailOnError(err, "Could not connect to database")
|
||||||
|
|
||||||
dbMap.AddTableWithName(core.ExternalCert{}, "externalCerts").SetKeys(false, "SHA1")
|
dbMap.AddTableWithName(core.ExternalCert{}, "externalCerts").SetKeys(false, "SHA1")
|
||||||
|
|
10
cmd/shell.go
10
cmd/shell.go
|
@ -170,15 +170,7 @@ type Config struct {
|
||||||
StatsdRate float32
|
StatsdRate float32
|
||||||
}
|
}
|
||||||
|
|
||||||
Common struct {
|
Common CommonConfig
|
||||||
BaseURL string
|
|
||||||
// Path to a PEM-encoded copy of the issuer certificate.
|
|
||||||
IssuerCert string
|
|
||||||
MaxKeySize int
|
|
||||||
|
|
||||||
DNSResolver string
|
|
||||||
DNSTimeout string
|
|
||||||
}
|
|
||||||
|
|
||||||
SubscriberAgreementURL string
|
SubscriberAgreementURL string
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue