Ryan Lane has submitted this change and it was merged.
Change subject: Redirect 80 to 443 for icinga and icinga-admin
......................................................................
Redirect 80 to 443 for icinga and icinga-admin
Change-Id: I8c34d7f92923d5a27c9e2884f80e27cabc94fa32
---
M templates/apache/sites/icinga.wikimedia.org.erb
1 file changed, 14 insertions(+), 14 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/apache/sites/icinga.wikimedia.org.erb
b/templates/apache/sites/icinga.wikimedia.org.erb
index 9d7e828..b869f26 100644
--- a/templates/apache/sites/icinga.wikimedia.org.erb
+++ b/templates/apache/sites/icinga.wikimedia.org.erb
@@ -47,20 +47,9 @@
ServerAdmin [email protected]
DocumentRoot /usr/share/icinga/htdocs
- <DirectoryMatch
(/usr/share/icinga/htdocs|/usr/lib/cgi-bin/icinga|/etc/icinga/stylesheets)>
- Options FollowSymLinks
- Options ExecCGI
- DirectoryIndex index.html
- AllowOverride None
-# AllowOverride AuthConfig
-# Order Allow,Deny
-# Allow From All
- </DirectoryMatch>
- <IfModule !mod_alias.c>
- LoadModule alias_module modules/mod_alias.so
- </IfModule>
-
- RedirectMatch ^/$ http://icinga.wikimedia.org/icinga
+ RewriteEngine on
+ RewriteCond %{SERVER_PORT} !^443$
+ RewriteRule ^/(.*)$ https://icinga.wikimedia.org/$1 [L,R]
ErrorLog /var/log/apache2/icinga.log
LogLevel warn
@@ -101,3 +90,14 @@
</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/51330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c34d7f92923d5a27c9e2884f80e27cabc94fa32
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
