BBlack has submitted this change and it was merged. Change subject: icinga.wikimedia.org cert sha1 to sha256 + chained file usage ......................................................................
icinga.wikimedia.org cert sha1 to sha256 + chained file usage Change-Id: I1c873cab17838103c61428b8995fef770d5efb22 --- M files/ssl/icinga.wikimedia.org.crt M modules/icinga/templates/icinga.wikimedia.org.erb 2 files changed, 26 insertions(+), 30 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified Dzahn: Looks good to me, but someone else must approve diff --git a/files/ssl/icinga.wikimedia.org.crt b/files/ssl/icinga.wikimedia.org.crt index 4db40ba..3a61123 100644 --- a/files/ssl/icinga.wikimedia.org.crt +++ b/files/ssl/icinga.wikimedia.org.crt @@ -1,30 +1,27 @@ -----BEGIN CERTIFICATE----- -MIIFLjCCBBagAwIBAgIDD+z/MA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT -MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew -HhcNMTQwMTA1MDQyMjAyWhcNMTYwMTA4MTI1ODU3WjCBwzEpMCcGA1UEBRMgdUtn -Y1ZVekU3dzNQam5lOUZUekdwVTRsUlMzY3N0OFcxEzARBgNVBAsTCkdUMjE4MTYw -MzMxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg -KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk -U1NMKFIpMR0wGwYDVQQDExRpY2luZ2Eud2lraW1lZGlhLm9yZzCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBAON1lpcwbZRCxXEesLZg1tSuO5VTwz96opZ0 -Bs6SIU2HiMqOjQZIXNzhok+GgYrFo9GREucSd7W7z66ZNdNaeVLX0+smcnU5WThx -pVmX3IERI7sgCL71x8Lh2/cfyHgPfXeQfbSEbt5ud23BqOYtIwmtIXgltexaj1t2 -auqWVogmrHwXMbPSOMEBOA2Gm7U4Djj6sw47O1m+uqNVYK44CRSbP5PDNtq8noqg -t8XJeTcCkQpmrBT1HvaVG+y4sifBMUBXmXolmL0hZoN8rBlcakkW4Md0TVzc6sKz -R5pzxPuoFJiz+ySPI19uVV7HL87kO0C5ieFIVTdgqjBhdXWN+30CAwEAAaOCAa8w -ggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQE -AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIU -aWNpbmdhLndpa2ltZWRpYS5vcmcwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3Jh -cGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0O -BBYEFKU/muhYBV42hRNII2b+J77vcvnEMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUH -AQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVz -dC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3Qu -Y29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggr -BgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczAN -BgkqhkiG9w0BAQUFAAOCAQEAZv0SKGl5iVJhKUaShnqGvc8+EHKgil6lhIvm0Q9T -XXUsL/cUcqLxWBr51BfEV3WBsG6WN/n8QIkLhu9+JvlXz3Yt3lfJoEYY6D1eAOkh -qe9VhPa71LTBVPn8WjFzuQPS728gMcN2jArjlT5nrZ3ZZuXwndNMWauSY+DjXvOK -pxWd/eUIUTJTF5gVQMUe56zHqz00Y3CO8VVvRG7qF9BkoqL4r2CGQOb5CLLJ/u3F -HeSBdaLtJcMTGZs3XkQmmk0terT/6gzhAglqNMBrcP8FsFKfyaqfdITNdgbAFsKh -eYh25bMOLeW9w7XsN/9JuwT21L4R6R3OuHJFmodNIzUyUg== +MIIEqzCCA5OgAwIBAgIDBLaQMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy +NTYgQ0EgLSBHMzAeFw0xNTA1MjgwMDM3MDRaFw0xNjAxMDgwMzAwNDZaMIGYMRMw +EQYDVQQLEwpHVDIxODE2MDMzMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv +bS9yZXNvdXJjZXMvY3BzIChjKTE0MS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW +YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEdMBsGA1UEAxMUaWNpbmdhLndpa2ltZWRp +YS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjdZaXMG2UQsVx +HrC2YNbUrjuVU8M/eqKWdAbOkiFNh4jKjo0GSFzc4aJPhoGKxaPRkRLnEne1u8+u +mTXTWnlS19PrJnJ1OVk4caVZl9yBESO7IAi+9cfC4dv3H8h4D313kH20hG7ebndt +wajmLSMJrSF4JbXsWo9bdmrqllaIJqx8FzGz0jjBATgNhpu1OA44+rMOOztZvrqj +VWCuOAkUmz+TwzbavJ6KoLfFyXk3ApEKZqwU9R72lRvsuLInwTFAV5l6JZi9IWaD +fKwZXGpJFuDHdE1c3OrCs0eac8T7qBSYs/skjyNfblVexy/O5DtAuYnhSFU3YKow +YXV1jft9AgMBAAGjggFMMIIBSDAfBgNVHSMEGDAWgBTDnPP800YINLvORn+gfFvz +4gjLWTBXBggrBgEFBQcBAQRLMEkwHwYIKwYBBQUHMAGGE2h0dHA6Ly9ndi5zeW1j +ZC5jb20wJgYIKwYBBQUHMAKGGmh0dHA6Ly9ndi5zeW1jYi5jb20vZ3YuY3J0MA4G +A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD +VR0RBBgwFoIUaWNpbmdhLndpa2ltZWRpYS5vcmcwKwYDVR0fBCQwIjAgoB6gHIYa +aHR0cDovL2d2LnN5bWNiLmNvbS9ndi5jcmwwDAYDVR0TAQH/BAIwADBBBgNVHSAE +OjA4MDYGBmeBDAECATAsMCoGCCsGAQUFBwIBFh5odHRwczovL3d3dy5yYXBpZHNz +bC5jb20vbGVnYWwwDQYJKoZIhvcNAQELBQADggEBACTTk1OrnMVfcChW52Ll1NR3 +Jt8YUSsXH2tuBg0Mlsgyr7PUhP6FDppXTwa/BvvxHTUh80zPAopTG9znnYvqyUPi +KEJ7+PiHHodP7z4FwyLhOcR7rVYO77DfOqFi1HiZfw/B01h3498q1J5Ixb8KrM9s +eghPwknMO52YzZiii8RDbC/zJ7/kwzRjJuiKeTf5YJ+w99Yq5DtLzf4sYM+7t5du +HfkIEkGVdUiQSTV8+1qQ28i6KBxTP1dzDpBdDccYRdoO9eayUmts79xIwzSc41Ue +bOVcWjLK3qIOPlw8FefS1ez9kDMEYvIrKhWWwNzHzAXfYubPvgFzE6oiTZ9tPWk= -----END CERTIFICATE----- diff --git a/modules/icinga/templates/icinga.wikimedia.org.erb b/modules/icinga/templates/icinga.wikimedia.org.erb index d404b0c..db29beb 100644 --- a/modules/icinga/templates/icinga.wikimedia.org.erb +++ b/modules/icinga/templates/icinga.wikimedia.org.erb @@ -20,9 +20,8 @@ ServerAlias neon.wikimedia.org ServerAdmin n...@wikimedia.org SSLEngine On - SSLCertificateFile /etc/ssl/localcerts/icinga.wikimedia.org.crt + SSLCertificateChainFile /etc/ssl/localcerts/icinga.wikimedia.org.chained.crt SSLCertificateKeyFile /etc/ssl/private/icinga.wikimedia.org.key - SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem <%= @ssl_settings.join("\n") %> DocumentRoot /usr/share/icinga/htdocs -- To view, visit https://gerrit.wikimedia.org/r/215393 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c873cab17838103c61428b8995fef770d5efb22 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits