diff --git a/cmd/boulder-ca/main.go b/cmd/boulder-ca/main.go index 042389612..f42c84201 100644 --- a/cmd/boulder-ca/main.go +++ b/cmd/boulder-ca/main.go @@ -27,13 +27,13 @@ const clientName = "CA" type config struct { CA cmd.CAConfig - *cmd.AllowedSigningAlgos + AllowedSigningAlgos *cmd.AllowedSigningAlgos PA cmd.PAConfig - cmd.StatsdConfig + Statsd cmd.StatsdConfig - cmd.SyslogConfig + Syslog cmd.SyslogConfig Common struct { // Path to a PEM-encoded copy of the issuer certificate. @@ -132,7 +132,7 @@ func main() { go cmd.DebugServer(c.CA.DebugAddr) - stats, logger := cmd.StatsAndLogging(c.StatsdConfig, c.SyslogConfig) + stats, logger := cmd.StatsAndLogging(c.Statsd, c.Syslog) defer logger.AuditPanic() logger.Info(cmd.VersionString(clientName)) @@ -155,7 +155,7 @@ func main() { clock.Default(), stats, issuers, - c.KeyPolicy(), + c.AllowedSigningAlgos.KeyPolicy(), logger) cmd.FailOnError(err, "Failed to create CA impl") cai.PA = pa diff --git a/cmd/boulder-publisher/main.go b/cmd/boulder-publisher/main.go index 4aea6758a..f289392de 100644 --- a/cmd/boulder-publisher/main.go +++ b/cmd/boulder-publisher/main.go @@ -24,9 +24,9 @@ type config struct { MaxConcurrentRPCServerRequests int64 } - cmd.StatsdConfig + Statsd cmd.StatsdConfig - cmd.SyslogConfig + Syslog cmd.SyslogConfig Common struct { CT struct { @@ -50,7 +50,7 @@ func main() { go cmd.DebugServer(c.Publisher.DebugAddr) - stats, logger := cmd.StatsAndLogging(c.StatsdConfig, c.SyslogConfig) + stats, logger := cmd.StatsAndLogging(c.Statsd, c.Syslog) defer logger.AuditPanic() logger.Info(cmd.VersionString(clientName)) diff --git a/cmd/boulder-ra/main.go b/cmd/boulder-ra/main.go index e1d658b36..29e36e479 100644 --- a/cmd/boulder-ra/main.go +++ b/cmd/boulder-ra/main.go @@ -52,13 +52,13 @@ type config struct { ReuseValidAuthz bool } - *cmd.AllowedSigningAlgos + AllowedSigningAlgos *cmd.AllowedSigningAlgos PA cmd.PAConfig - cmd.StatsdConfig + Statsd cmd.StatsdConfig - cmd.SyslogConfig + Syslog cmd.SyslogConfig Common struct { DNSResolver string @@ -81,7 +81,7 @@ func main() { go cmd.DebugServer(c.RA.DebugAddr) - stats, logger := cmd.StatsAndLogging(c.StatsdConfig, c.SyslogConfig) + stats, logger := cmd.StatsAndLogging(c.Statsd, c.Syslog) defer logger.AuditPanic() logger.Info(cmd.VersionString(clientName)) diff --git a/cmd/boulder-sa/main.go b/cmd/boulder-sa/main.go index 885353b43..cdbfc71d2 100644 --- a/cmd/boulder-sa/main.go +++ b/cmd/boulder-sa/main.go @@ -22,9 +22,9 @@ type config struct { MaxConcurrentRPCServerRequests int64 } - cmd.StatsdConfig + Statsd cmd.StatsdConfig - cmd.SyslogConfig + Syslog cmd.SyslogConfig } func main() { @@ -41,7 +41,7 @@ func main() { go cmd.DebugServer(c.SA.DebugAddr) - stats, logger := cmd.StatsAndLogging(c.StatsdConfig, c.SyslogConfig) + stats, logger := cmd.StatsAndLogging(c.Statsd, c.Syslog) defer logger.AuditPanic() logger.Info(cmd.VersionString(clientName)) diff --git a/cmd/boulder-wfe/main.go b/cmd/boulder-wfe/main.go index 5c57de02b..d27363bb1 100644 --- a/cmd/boulder-wfe/main.go +++ b/cmd/boulder-wfe/main.go @@ -40,13 +40,13 @@ type config struct { CheckMalformedCSR bool } - *cmd.AllowedSigningAlgos + AllowedSigningAlgos *cmd.AllowedSigningAlgos - cmd.StatsdConfig + Statsd cmd.StatsdConfig SubscriberAgreementURL string - cmd.SyslogConfig + Syslog cmd.SyslogConfig Common struct { BaseURL string @@ -79,7 +79,7 @@ func main() { go cmd.DebugServer(c.WFE.DebugAddr) - stats, logger := cmd.StatsAndLogging(c.StatsdConfig, c.SyslogConfig) + stats, logger := cmd.StatsAndLogging(c.Statsd, c.Syslog) defer logger.AuditPanic() logger.Info(cmd.VersionString(clientName)) @@ -116,7 +116,7 @@ func main() { wfe.IssuerCert, err = cmd.LoadCert(c.Common.IssuerCert) cmd.FailOnError(err, fmt.Sprintf("Couldn't read issuer cert [%s]", c.Common.IssuerCert)) - logger.Info(fmt.Sprintf("WFE using key policy: %#v", c.KeyPolicy())) + logger.Info(fmt.Sprintf("WFE using key policy: %#v", c.AllowedSigningAlgos.KeyPolicy())) go cmd.ProfileCmd("WFE", stats) diff --git a/cmd/ocsp-updater/main.go b/cmd/ocsp-updater/main.go index 7bfa7a646..80ca4b89d 100644 --- a/cmd/ocsp-updater/main.go +++ b/cmd/ocsp-updater/main.go @@ -552,9 +552,9 @@ const clientName = "OCSP" type config struct { OCSPUpdater cmd.OCSPUpdaterConfig - cmd.StatsdConfig + Statsd cmd.StatsdConfig - cmd.SyslogConfig + Syslog cmd.SyslogConfig Common struct { IssuerCert string @@ -603,7 +603,7 @@ func main() { go cmd.DebugServer(conf.DebugAddr) - stats, auditlogger := cmd.StatsAndLogging(c.StatsdConfig, c.SyslogConfig) + stats, auditlogger := cmd.StatsAndLogging(c.Statsd, c.Syslog) defer auditlogger.AuditPanic() auditlogger.Info(cmd.VersionString(clientName))