Lcarr has uploaded a new change for review. https://gerrit.wikimedia.org/r/75786
Change subject: removing nagios redirects :( ...................................................................... removing nagios redirects :( Change-Id: I6059db2b663ca21d5c5c40bfe1f384542556eba8 --- M templates/apache/sites/icinga.wikimedia.org.erb 1 file changed, 0 insertions(+), 29 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/86/75786/1 diff --git a/templates/apache/sites/icinga.wikimedia.org.erb b/templates/apache/sites/icinga.wikimedia.org.erb index de65f37..ec6b66e 100644 --- a/templates/apache/sites/icinga.wikimedia.org.erb +++ b/templates/apache/sites/icinga.wikimedia.org.erb @@ -16,35 +16,6 @@ Alias /icinga /usr/share/icinga/htdocs <VirtualHost *:443> - ServerName nagios.wikimedia.org - ServerAdmin [email protected] - SSLEngine On - SSLCertificateFile /etc/ssl/private/star.wikimedia.org.pem - SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key - SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem - - # Bug 45926 - keep back compatibility for nagios URLs - RewriteEngine on - # Rewrite the 'nagios' path under cgi-bin - RewriteRule ^/cgi-bin/nagios/(.*) https://icinga.wikimedia.org/cgi-bin/icinga/$1 [L,R=301] - # Wildcard redirect: - RewriteRule ^/(.*)$ https://icinga.wikimedia.org/$1 [R=301] -</VirtualHost> - -<VirtualHost *:80> - ServerName nagios.wikimedia.org - ServerAdmin [email protected] - - # Bug 45926 - keep back compatibility for nagios URLs - RewriteEngine on - # Rewrite the 'nagios' path under cgi-bin - RewriteRule ^/cgi-bin/nagios/(.*) https://icinga.wikimedia.org/cgi-bin/icinga/$1 [L,R=301] - # Wildcard redirect: - RewriteRule ^/(.*)$ https://icinga.wikimedia.org/$1 [R=301] -</VirtualHost> - - -<VirtualHost *:443> ServerName icinga.wikimedia.org ServerAlias neon.wikimedia.org ServerAdmin [email protected] -- To view, visit https://gerrit.wikimedia.org/r/75786 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6059db2b663ca21d5c5c40bfe1f384542556eba8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Lcarr <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
