Fix merge stompage

cmd/external-cert-importer/main.go

@@ -159,7 +159,7 @@ func main() {
 		blog.SetAuditLogger(auditlogger)
 
 		// 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")
 
 		dbMap.AddTableWithName(core.ExternalCert{}, "externalCerts").SetKeys(false, "SHA1")

cmd/shell.go

@@ -170,15 +170,7 @@ type Config struct {
 		StatsdRate                 float32
 	}
 
-	Common struct {
-		BaseURL string
-		// Path to a PEM-encoded copy of the issuer certificate.
-		IssuerCert string
-		MaxKeySize int
-
-		DNSResolver string
-		DNSTimeout  string
-	}
+	Common CommonConfig
 
 	SubscriberAgreementURL string
 }