diff --git a/bad-key-revoker_main.patch b/bad-key-revoker_main.patch index 2e0b8a2..a69d503 100644 --- a/bad-key-revoker_main.patch +++ b/bad-key-revoker_main.patch @@ -1,16 +1,16 @@ diff --git a/cmd/bad-key-revoker/main.go b/cmd/bad-key-revoker/main.go -index 7d4c9311..2858ada7 100644 +index 17704c41..e2a060b1 100644 --- a/cmd/bad-key-revoker/main.go +++ b/cmd/bad-key-revoker/main.go -@@ -13,6 +13,7 @@ import ( - "strings" +@@ -14,6 +14,7 @@ import ( "time" + "github.com/honeycombio/beeline-go" + "github.com/letsencrypt/boulder/bdns" "github.com/letsencrypt/boulder/cmd" "github.com/letsencrypt/boulder/core" corepb "github.com/letsencrypt/boulder/core/proto" -@@ -345,6 +346,9 @@ func main() { +@@ -346,6 +347,9 @@ func main() { TLS cmd.TLSConfig RAService *cmd.GRPCClientConfig @@ -20,10 +20,10 @@ index 7d4c9311..2858ada7 100644 // MaximumRevocations specifies the maximum number of certificates associated with // a key hash that bad-key-revoker will attempt to revoke. If the number of certificates // is higher than MaximumRevocations bad-key-revoker will error out and refuse to -@@ -371,6 +375,12 @@ func main() { - } +@@ -373,6 +377,12 @@ func main() { - Syslog cmd.SyslogConfig + Syslog cmd.SyslogConfig + Beeline cmd.BeelineConfig + + Common struct { + DNSResolver string @@ -33,7 +33,7 @@ index 7d4c9311..2858ada7 100644 } configPath := flag.String("config", "", "File path to the configuration file for this service") flag.Parse() -@@ -411,6 +421,30 @@ func main() { +@@ -418,6 +428,30 @@ func main() { cmd.FailOnError(err, "Failed to load credentials and create gRPC connection to RA") rac := rapb.NewRegistrationAuthorityClient(conn) @@ -64,7 +64,7 @@ index 7d4c9311..2858ada7 100644 var smtpRoots *x509.CertPool if config.BadKeyRevoker.Mailer.SMTPTrustedRootFile != "" { pem, err := ioutil.ReadFile(config.BadKeyRevoker.Mailer.SMTPTrustedRootFile) -@@ -432,6 +466,7 @@ func main() { +@@ -439,6 +473,7 @@ func main() { config.BadKeyRevoker.Mailer.Username, smtpPassword, smtpRoots, diff --git a/config_bad-key-revoker.patch b/config_bad-key-revoker.patch index 227278f..bb45020 100644 --- a/config_bad-key-revoker.patch +++ b/config_bad-key-revoker.patch @@ -1,5 +1,5 @@ diff --git a/test/config/bad-key-revoker.json b/test/config/bad-key-revoker.json -index 482fd85fc..3e678aa5b 100644 +index dc8c7da5..8f65f3a0 100644 --- a/test/config/bad-key-revoker.json +++ b/test/config/bad-key-revoker.json @@ -5,6 +5,11 @@ @@ -14,7 +14,7 @@ index 482fd85fc..3e678aa5b 100644 "tls": { "caCertFile": "test/grpc-creds/minica.pem", "certFile": "test/grpc-creds/bad-key-revoker.boulder/cert.pem", -@@ -26,10 +31,14 @@ +@@ -26,7 +31,7 @@ }, "maximumRevocations": 15, "findCertificatesBatchSize": 10, @@ -23,7 +23,10 @@ index 482fd85fc..3e678aa5b 100644 }, "syslog": { "stdoutlevel": 4, - "sysloglevel": 4 +@@ -35,5 +40,9 @@ + "beeline": { + "mute": true, + "dataset": "Test" + }, + "common": { + "dnsTimeout": "3s", diff --git a/config_expiration-mailer.patch b/config_expiration-mailer.patch index 50f59f6..fe02054 100644 --- a/config_expiration-mailer.patch +++ b/config_expiration-mailer.patch @@ -1,5 +1,5 @@ diff --git a/test/config/expiration-mailer.json b/test/config/expiration-mailer.json -index 566585628..09ff81a2c 100644 +index 4519fe4d..f52a408c 100644 --- a/test/config/expiration-mailer.json +++ b/test/config/expiration-mailer.json @@ -13,6 +13,11 @@ @@ -14,12 +14,11 @@ index 566585628..09ff81a2c 100644 "tls": { "caCertFile": "test/grpc-creds/minica.pem", "certFile": "test/grpc-creds/expiration-mailer.boulder/cert.pem", -@@ -29,5 +34,10 @@ - "syslog": { - "stdoutlevel": 6, - "sysloglevel": 6 +@@ -33,5 +38,9 @@ + "beeline": { + "mute": true, + "dataset": "Test" + }, -+ + "common": { + "dnsTimeout": "3s", + "dnsAllowLoopbackAddresses": true diff --git a/expiration-mailer_main.patch b/expiration-mailer_main.patch index ead6557..3ed6803 100644 --- a/expiration-mailer_main.patch +++ b/expiration-mailer_main.patch @@ -1,16 +1,16 @@ diff --git a/cmd/expiration-mailer/main.go b/cmd/expiration-mailer/main.go -index 30aa52a1..a72b4734 100644 +index 95c8a035..2ff70d7d 100644 --- a/cmd/expiration-mailer/main.go +++ b/cmd/expiration-mailer/main.go -@@ -19,6 +19,7 @@ import ( - +@@ -20,6 +20,7 @@ import ( + "github.com/honeycombio/beeline-go" "github.com/jmhodges/clock" + "github.com/letsencrypt/boulder/bdns" "github.com/letsencrypt/boulder/cmd" "github.com/letsencrypt/boulder/core" "github.com/letsencrypt/boulder/db" -@@ -34,7 +35,7 @@ import ( +@@ -35,7 +36,7 @@ import ( const ( defaultNagCheckInterval = 24 * time.Hour @@ -19,7 +19,7 @@ index 30aa52a1..a72b4734 100644 ) type regStore interface { -@@ -383,6 +384,9 @@ type config struct { +@@ -384,6 +385,9 @@ type config struct { TLS cmd.TLSConfig SAService *cmd.GRPCClientConfig @@ -29,20 +29,20 @@ index 30aa52a1..a72b4734 100644 // Path to a file containing a list of trusted root certificates for use // during the SMTP connection (as opposed to the gRPC connections). SMTPTrustedRootFile string -@@ -391,6 +395,12 @@ type config struct { - } +@@ -393,6 +397,12 @@ type config struct { - Syslog cmd.SyslogConfig + Syslog cmd.SyslogConfig + Beeline cmd.BeelineConfig + + Common struct { -+ DNSResolver string -+ DNSTimeout string -+ DNSAllowLoopbackAddresses bool -+ } ++ DNSResolver string ++ DNSTimeout string ++ DNSAllowLoopbackAddresses bool ++ } } func initStats(stats prometheus.Registerer) mailerStats { -@@ -500,6 +510,30 @@ func main() { +@@ -507,6 +517,30 @@ func main() { cmd.FailOnError(err, "Failed to load credentials and create gRPC connection to SA") sac := bgrpc.NewStorageAuthorityClient(sapb.NewStorageAuthorityClient(conn)) @@ -73,7 +73,7 @@ index 30aa52a1..a72b4734 100644 var smtpRoots *x509.CertPool if c.Mailer.SMTPTrustedRootFile != "" { pem, err := ioutil.ReadFile(c.Mailer.SMTPTrustedRootFile) -@@ -535,6 +569,7 @@ func main() { +@@ -542,6 +576,7 @@ func main() { c.Mailer.Username, smtpPassword, smtpRoots, diff --git a/install b/install index f8fd7d7..95886cd 100755 --- a/install +++ b/install @@ -24,7 +24,7 @@ dockerComposeVersion="1.28.5" labcaUrl="https://github.com/hakwerk/labca/" boulderUrl="https://github.com/letsencrypt/boulder/" -boulderTag="release-2021-05-17" +boulderTag="release-2021-06-01" # # Color configuration diff --git a/ra_ra.patch b/ra_ra.patch index cd93566..257c631 100644 --- a/ra_ra.patch +++ b/ra_ra.patch @@ -1,8 +1,8 @@ diff --git a/ra/ra.go b/ra/ra.go -index 16e277e9d..159f74f29 100644 +index 1fd47d29..ccc5aef8 100644 --- a/ra/ra.go +++ b/ra/ra.go -@@ -30,7 +30,6 @@ import ( +@@ -31,7 +31,6 @@ import ( "github.com/letsencrypt/boulder/issuance" blog "github.com/letsencrypt/boulder/log" "github.com/letsencrypt/boulder/metrics" @@ -10,7 +10,7 @@ index 16e277e9d..159f74f29 100644 "github.com/letsencrypt/boulder/probs" pubpb "github.com/letsencrypt/boulder/publisher/proto" rapb "github.com/letsencrypt/boulder/ra/proto" -@@ -442,7 +441,7 @@ func (ra *RegistrationAuthorityImpl) validateContacts(ctx context.Context, conta +@@ -443,7 +442,7 @@ func (ra *RegistrationAuthorityImpl) validateContacts(ctx context.Context, conta contact, ) }