RobH has uploaded a new change for review.
https://gerrit.wikimedia.org/r/191699
Change subject: remove support for icinga-admin.wikimedia.org
......................................................................
remove support for icinga-admin.wikimedia.org
We've locked down icinga entirely to require login, so the admin url for
login actions is no longer required. As the certificate is expiring on
2015-02-26, it seems unnecessary to have both FQDNs in use.
T90002T90002
Change-Id: I739906c6e5355e645b4347dfc7451b7228b8b285
---
D files/ssl/icinga-admin.wikimedia.org.crt
M modules/icinga/templates/icinga.wikimedia.org.erb
2 files changed, 0 insertions(+), 78 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/191699/1
diff --git a/files/ssl/icinga-admin.wikimedia.org.crt
b/files/ssl/icinga-admin.wikimedia.org.crt
deleted file mode 100644
index 08d7774..0000000
--- a/files/ssl/icinga-admin.wikimedia.org.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFOjCCBCKgAwIBAgIDEOLPMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTQwMjIzMTUzOTEwWhcNMTUwMjI2MTg0MzQ1WjCByTEpMCcGA1UEBRMgN1k4
-ZVEzZHBOMW9FejBZMVljemhzNXRCd21yYk9mT0sxEzARBgNVBAsTCkdUMzU5NzQw
-NDAxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
-KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
-U1NMKFIpMSMwIQYDVQQDExppY2luZ2EtYWRtaW4ud2lraW1lZGlhLm9yZzCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/Qk0cPyjKf4ssCK4fJOgMVSuET
-+9Ukt//GKeWf/ulGFpRtwodsGFhV0/ktV3C1kUxQvu7dTCStPXovPjZH/09S6E0w
-0BvbGfOYggAsBwDBPADKLK5owPYb23Y52dkeeghV/xoAHhdJrR1XhUGIYLe+j3Vk
-nrnuqEohhsE/E994jQS9vllnGYPTkTxh9TrASuxhlkFjUIMJJ0YzkKnHR1kEP2h5
-vIYOfa+PlrWSrZwbLa1WgOl4szL9Px+tsKhNqYhqsWEfZEGDjtUiEQcjahWMVI6F
-eG61edNexs0u/+2XJ0a3jMLUm+jsI+q3EhYviLgfXubxUdj4eC3I0aZxC/UCAwEA
-AaOCAbUwggGxMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1Ud
-DwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwJQYDVR0R
-BB4wHIIaaWNpbmdhLWFkbWluLndpa2ltZWRpYS5vcmcwQwYDVR0fBDwwOjA4oDag
-NIYyaHR0cDovL3JhcGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNz
-bC5jcmwwHQYDVR0OBBYEFDk1IHhKbnFgAApMABBdcsVCRb3DMAwGA1UdEwEB/wQC
-MAAweAYIKwYBBQUHAQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wt
-b2NzcC5nZW90cnVzdC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1h
-aWEuZ2VvdHJ1c3QuY29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG
-+EUBBzYwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVz
-b3VyY2VzL2NwczANBgkqhkiG9w0BAQUFAAOCAQEAvj31+cWh6wO6zv79B/mcZZB3
-XdisFVgFyBWLMJKBC1lxFUy2aj+fXnvO/KcknzHISBFNT6gKb8YIn9B0xtw25oi5
-yG1vgKnOh5gmmKSDzHiUsn2ueiz4msNtrDzDwRFdjqrwj8H6PZee9YH14MmMqv13
-qhYzgXLqz9FqL+YjiAjZ1sz3kqVFwB4046Uv9zas3bpc9jAIr0PcvhB0cC07Hkgi
-Rxrl831Y2yHDvFCa60FN9npqH1UQv8mxrA+pI/1HZlaW874o1qcFHSIoj1mI5Ia9
-z1nP22Sz9JIQe/0SaxI8AsHew3Fz4i7gWPV+7H1w1Zd5L/FGjLUVdVhalfBTgg==
------END CERTIFICATE-----
diff --git a/modules/icinga/templates/icinga.wikimedia.org.erb
b/modules/icinga/templates/icinga.wikimedia.org.erb
index f5576f8..914c4de 100644
--- a/modules/icinga/templates/icinga.wikimedia.org.erb
+++ b/modules/icinga/templates/icinga.wikimedia.org.erb
@@ -67,51 +67,3 @@
ErrorLog /var/log/apache2/icinga.log
LogLevel warn
</VirtualHost>
-
-<VirtualHost *:443>
- ServerName icinga-admin.wikimedia.org
- SSLEngine On
- SSLCertificateFile /etc/ssl/localcerts/icinga-admin.wikimedia.org.crt
- SSLCertificateKeyFile /etc/ssl/private/icinga-admin.wikimedia.org.key
- SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem
- <%= @ssl_settings.join("\n") %>
-
- DocumentRoot /usr/share/icinga/htdocs
-
- <DirectoryMatch
(/usr/share/icinga/htdocs|/usr/lib/cgi-bin/icinga|/etc/icinga/stylesheets)>
- Options FollowSymLinks
- SSLRequireSSL
- Options ExecCGI
- DirectoryIndex index.html
-# AllowOverride None
- AllowOverride AuthConfig
- Order Allow,Deny
- Allow From All
- AuthName "WMF Labs (use wiki login name not shell)"
- AuthType Basic
- AuthBasicProvider ldap
- AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
- AuthLDAPBindPassword <%= @proxypass %>
- AuthLDAPURL "ldaps://ldap-eqiad.wikimedia.org
ldap-codfw.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn"
- Require ldap-group cn=wmf,ou=groups,dc=wikimedia,dc=org
- </DirectoryMatch>
- <IfModule !mod_alias.c>
- LoadModule alias_module modules/mod_alias.so
- </IfModule>
-
- RedirectMatch ^/$ https://icinga-admin.wikimedia.org/icinga
- ErrorLog /var/log/apache2/icinga.log
- LogLevel warn
-</VirtualHost>
-
-<VirtualHost *:80>
- ServerName icinga-admin.wikimedia.org
- DocumentRoot /usr/share/icinga/htdocs
-
- RewriteEngine on
- RewriteCond %{SERVER_PORT} !^443$
- RewriteRule ^/(.*)$ https://icinga-admin.wikimedia.org/$1 [L,R]
-
- ErrorLog /var/log/apache2/icinga.log
- LogLevel warn
-</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/191699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I739906c6e5355e645b4347dfc7451b7228b8b285
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
