bad-key-revoker, cmd: Remove unused mailer & SMTPConfig stanzas (#8302)
Part of #8199
This commit is contained in:
parent
102997da4a
commit
79a7cb3c1b
|
@ -288,16 +288,6 @@ type Config struct {
|
|||
// algorithm will wait before retrying in the event of error
|
||||
// or no work to do.
|
||||
BackoffIntervalMax config.Duration `validate:"-"`
|
||||
|
||||
// Deprecated: the bad-key-revoker no longer sends emails; we use ARI.
|
||||
// TODO(#8199): Remove this config stanza entirely.
|
||||
Mailer struct {
|
||||
cmd.SMTPConfig `validate:"-"`
|
||||
SMTPTrustedRootFile string
|
||||
From string
|
||||
EmailSubject string
|
||||
EmailTemplate string
|
||||
}
|
||||
}
|
||||
|
||||
Syslog cmd.SyslogConfig
|
||||
|
|
|
@ -89,15 +89,6 @@ func (d *DBConfig) URL() (string, error) {
|
|||
return strings.TrimSpace(string(url)), err
|
||||
}
|
||||
|
||||
// SMTPConfig is deprecated.
|
||||
// TODO(#8199): Delete this when it is removed from bad-key-revoker's config.
|
||||
type SMTPConfig struct {
|
||||
PasswordConfig
|
||||
Server string `validate:"required"`
|
||||
Port string `validate:"required,numeric,min=1,max=65535"`
|
||||
Username string `validate:"required"`
|
||||
}
|
||||
|
||||
// PAConfig specifies how a policy authority should connect to its
|
||||
// database, what policies it should enforce, and what challenges
|
||||
// it should offer.
|
||||
|
|
|
@ -415,9 +415,9 @@ type CertificateStatus struct {
|
|||
LastExpirationNagSent time.Time `db:"lastExpirationNagSent"`
|
||||
|
||||
// NotAfter and IsExpired are convenience columns which allow expensive
|
||||
// queries to quickly filter out certificates that we don't need to care about
|
||||
// anymore. These are particularly useful for the expiration mailer and CRL
|
||||
// updater. See https://github.com/letsencrypt/boulder/issues/1864.
|
||||
// queries to quickly filter out certificates that we don't need to care
|
||||
// about anymore. These are particularly useful for the CRL updater. See
|
||||
// https://github.com/letsencrypt/boulder/issues/1864.
|
||||
NotAfter time.Time `db:"notAfter"`
|
||||
IsExpired bool `db:"isExpired"`
|
||||
|
||||
|
|
|
@ -20,16 +20,6 @@
|
|||
"noWaitForReady": true,
|
||||
"timeout": "15s"
|
||||
},
|
||||
"mailer": {
|
||||
"server": "localhost",
|
||||
"port": "9380",
|
||||
"username": "cert-manager@example.com",
|
||||
"from": "bad key revoker <bad-key-revoker@test.org>",
|
||||
"passwordFile": "test/secrets/smtp_password",
|
||||
"SMTPTrustedRootFile": "test/certs/ipki/minica.pem",
|
||||
"emailSubject": "Certificates you've issued have been revoked due to key compromise",
|
||||
"emailTemplate": "test/example-bad-key-revoker-template"
|
||||
},
|
||||
"maximumRevocations": 15,
|
||||
"findCertificatesBatchSize": 10,
|
||||
"interval": "50ms",
|
||||
|
|
Loading…
Reference in New Issue