Dzahn has submitted this change and it was merged.
Change subject: RT#5010 blog.wikimedia.org getting its own cert
......................................................................
RT#5010 blog.wikimedia.org getting its own cert
Change-Id: Ica541d602a54d12629f96ed862858c67c2bbc291
---
M files/apache/sites/blog.wikimedia.org
A files/ssl/blog.wikimedia.org.pem
M manifests/misc/blogs.pp
3 files changed, 35 insertions(+), 5 deletions(-)
Approvals:
RobH: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/files/apache/sites/blog.wikimedia.org
b/files/apache/sites/blog.wikimedia.org
index 4717cde..9f97386 100644
--- a/files/apache/sites/blog.wikimedia.org
+++ b/files/apache/sites/blog.wikimedia.org
@@ -61,8 +61,8 @@
SSLProtocol -ALL +SSLv3 +TLSv1
SSLCipherSuite
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
SSLHonorCipherOrder on
- SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
- SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
+ SSLCertificateFile /etc/ssl/certs/blog.wikimedia.org.pem
+ SSLCertificateKeyFile /etc/ssl/private/blog.wikimedia.org.key
SSLCACertificatePath /etc/ssl/certs/
<Directory />
@@ -120,8 +120,8 @@
ServerAdmin [email protected]
ServerName techblog.wikimedia.org
SSLEngine on
- SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
- SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
+ SSLCertificateFile /etc/ssl/certs/blog.wikimedia.org.pem
+ SSLCertificateKeyFile /etc/ssl/private/blog.wikimedia.org.key
SSLCACertificatePath /etc/ssl/certs/
ServerAlias communityblog.wikimedia.org globalblog.wikimedia.org
blog.wikimediafoundation.org
diff --git a/files/ssl/blog.wikimedia.org.pem b/files/ssl/blog.wikimedia.org.pem
new file mode 100644
index 0000000..9fd0958
--- /dev/null
+++ b/files/ssl/blog.wikimedia.org.pem
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFKjCCBBKgAwIBAgIDDdhAMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
+HhcNMTMwOTA0MTkxODM1WhcNMTcwOTA2MDAwOTMyWjCBwTEpMCcGA1UEBRMgcnh2
+b3pkNmFzWnpUQWJ1YlA1WmdtbG5NenQ5R2pzUjkxEzARBgNVBAsTCkdUODQ5NTA3
+ODAxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
+KGMpMTMxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
+U1NMKFIpMRswGQYDVQQDExJibG9nLndpa2ltZWRpYS5vcmcwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC/OIN9nSOlZUt5cf+/dQ+iydY4R44qnuLvYeKR
+EQMGWs+oB8m7/Iodpbzuv29m7lbcsNIWhq9HvERjBf/wG6pam1kkJJKf6l3MIAfu
+4uPu2rdp/ZI2YA9FSLv9Y+1blU//7rdGw92nvZIsheS+96o/ILCO1tv7D3A7m3nZ
+2RmvlBnmRp00Bbrd6/qjeEF6qTC3JejNYKY1GE77sAecAxR05IFmk6cKWnmDCVkh
+zMDjS7SAG9Cp6xzvOOWbi3aLjWE8ILn+13EWpJk+9CjUEobVUBZndh4ib37Ptxmh
+sXngFwNKnAVo7OpzeT0CEYxaiWosqXXBexzHwpAFIMa9Ez8/AgMBAAGjggGtMIIB
+qTAfBgNVHSMEGDAWgBRraT1qGEJK3Y8CZTn9NSSGeJEWMDAOBgNVHQ8BAf8EBAMC
+BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdEQQWMBSCEmJs
+b2cud2lraW1lZGlhLm9yZzBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vcmFwaWRz
+c2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNybDAdBgNVHQ4EFgQU
+ut9HOlJ08OrXF6xTvw/si6xRN2gwDAYDVR0TAQH/BAIwADB4BggrBgEFBQcBAQRs
+MGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9yYXBpZHNzbC1vY3NwLmdlb3RydXN0LmNv
+bTA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5nZW90cnVzdC5jb20v
+cmFwaWRzc2wuY3J0MEwGA1UdIARFMEMwQQYKYIZIAYb4RQEHNjAzMDEGCCsGAQUF
+BwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJjZXMvY3BzMA0GCSqG
+SIb3DQEBBQUAA4IBAQC+soxeJpO1AnzRjGRz8uPgZQ4R+kiwbNsBiyhMumsEvp90
+eQ7czKQ8mlsjPQHInaveZF5TUzJdsfZn7q3wHoJLkxQwCYaV+xa6Ifly6cHAscLh
+4zJCytFY/fA1ZVUdeXiQ9kAuLk3TMPpInQYDi7gHIG3r4TqFRoU2d1+reyiEJPwk
+z/po+md9BO6th5+h2W3+uOD3N7GEexTleJ4JFMn/h+JntwfHfaIvo9r4Yw8/dyop
+3iuNSFSLfCcgAfjInH+5jNLCYz6Qu0iE8L/Gn7B+4/BzrY2qnWYAh3iP5Nz/bEfz
+K/fZrjFqKa+EnWJjsvQktV4yp7rXk6y0sVtC7EeF
+-----END CERTIFICATE-----
diff --git a/manifests/misc/blogs.pp b/manifests/misc/blogs.pp
index a4e959d..5ff9ead 100644
--- a/manifests/misc/blogs.pp
+++ b/manifests/misc/blogs.pp
@@ -31,7 +31,7 @@
}
class { "memcached": memcached_ip => "127.0.0.1" }
- install_certificate{ "star.wikimedia.org": }
+ install_certificate{ "blog.wikimedia.org": }
# There's not really a good reason for this to be "",
# except that it was like that when I found it.
--
To view, visit https://gerrit.wikimedia.org/r/83008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica541d602a54d12629f96ed862858c67c2bbc291
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
