diff --git a/config_bad-key-revoker.patch b/config_bad-key-revoker.patch index 9ad58fd..8019e00 100644 --- a/config_bad-key-revoker.patch +++ b/config_bad-key-revoker.patch @@ -1,9 +1,9 @@ diff --git a/test/config/bad-key-revoker.json b/test/config/bad-key-revoker.json -index 7d1b704..1bead8d 100644 +index 482fd85fc..3e678aa5b 100644 --- a/test/config/bad-key-revoker.json +++ b/test/config/bad-key-revoker.json -@@ -3,6 +3,10 @@ - "dbConnectFile": "labca/secrets/badkeyrevoker_dburl", +@@ -3,6 +3,11 @@ + "dbConnectFile": "test/secrets/badkeyrevoker_dburl", "maxDBConns": 10, "debugAddr": ":8020", + "dnsTries": 3, @@ -12,9 +12,9 @@ index 7d1b704..1bead8d 100644 + "127.0.0.1:8054" + ], "tls": { - "caCertFile": "labca/grpc-creds/minica.pem", - "certFile": "labca/grpc-creds/bad-key-revoker.boulder/cert.pem", -@@ -24,10 +28,14 @@ + "caCertFile": "test/grpc-creds/minica.pem", + "certFile": "test/grpc-creds/bad-key-revoker.boulder/cert.pem", +@@ -24,10 +29,14 @@ }, "maximumRevocations": 15, "findCertificatesBatchSize": 10, diff --git a/config_notify-mailer.patch b/config_notify-mailer.patch index 7b6ddaa..56632ef 100644 --- a/config_notify-mailer.patch +++ b/config_notify-mailer.patch @@ -1,5 +1,5 @@ diff --git a/test/config/notify-mailer.json b/test/config/notify-mailer.json -index 04405da..57f850e 100644 +index 73864aeb5..5e43e7689 100644 --- a/test/config/notify-mailer.json +++ b/test/config/notify-mailer.json @@ -2,11 +2,19 @@ @@ -7,7 +7,7 @@ index 04405da..57f850e 100644 "server": "localhost", "port": "9380", + "hostnamePolicyFile": "test/hostname-policy.yaml", - "username": "cert-master@example.com", + "username": "cert-manager@example.com", "passwordFile": "test/secrets/smtp_password", "dbConnectFile": "test/secrets/mailer_dburl", "maxDBConns": 10 diff --git a/gui/dashboard.go b/gui/dashboard.go index 15c698a..210c3b1 100644 --- a/gui/dashboard.go +++ b/gui/dashboard.go @@ -92,7 +92,7 @@ func _parseLine(line string, loc *time.Location) Activity { if idx > -1 { message = message[0:idx] } - idx = strings.Index(message, " precertificate=[") + idx = strings.Index(message, " certificate=[") if idx > -1 { message = message[0:idx] } diff --git a/install b/install index 2d4f29f..e13dc53 100755 --- a/install +++ b/install @@ -24,7 +24,7 @@ dockerComposeVersion="1.22.0" labcaUrl="https://github.com/hakwerk/labca/" boulderUrl="https://github.com/letsencrypt/boulder/" -boulderTag="release-2020-06-08" +boulderTag="release-2020-07-13" # # Color configuration @@ -510,7 +510,7 @@ config_boulder() { sudo -u labca patch -p1 -o "$boulderLabCADir/config/expiration-mailer.json" < $cloneDir/config_expiration-mailer.patch &>>$installLog sudo -u labca patch -p1 -o "$boulderLabCADir/config/notify-mailer.json" < $cloneDir/config_notify-mailer.patch &>>$installLog - #sudo -u labca patch -p1 -o "$boulderLabCADir/config/bad-key-revoker.json" < $cloneDir/config_bad-key-revoker.patch &>>$installLog + sudo -u labca patch -p1 -o "$boulderLabCADir/config/bad-key-revoker.json" < $cloneDir/config_bad-key-revoker.patch &>>$installLog sed -i -e "s|https://letsencrypt.org/docs/rate-limits/|http://$LABCA_FQDN/rate-limits|" errors/errors.go &>>$installLog cp errors/errors.go "$boulderLabCADir/.backup/"