Lcarr has submitted this change and it was merged.
Change subject: switching icinga with https by default to not log you in
......................................................................
switching icinga with https by default to not log you in
Change-Id: Iac1ebe63d3039c32f108095e287eb5eafd849223
---
A files/apache/sites/icinga-admin.wikimedia.org
M files/apache/sites/icinga.wikimedia.org
2 files changed, 44 insertions(+), 8 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
Lcarr:
jenkins-bot: Verified
diff --git a/files/apache/sites/icinga-admin.wikimedia.org
b/files/apache/sites/icinga-admin.wikimedia.org
new file mode 100644
index 0000000..a2dd34a
--- /dev/null
+++ b/files/apache/sites/icinga-admin.wikimedia.org
@@ -0,0 +1,43 @@
+AddHandler cgi-script .cgi
+## BEGIN APACHE CONFIG SNIPPET - ICINGA.CONF
+#Alias /stylesheets /etc/icinga/stylesheets
+ScriptAlias /cgi-bin/icinga /usr/lib/cgi-bin/icinga
+ScriptAlias /icinga/cgi-bin /usr/lib/cgi-bin/icinga
+
+# Where the stylesheets (config files) reside
+Alias /icinga/stylesheets /etc/icinga/stylesheets
+
+# Where the HTML pages live
+Alias /icinga /usr/share/icinga/htdocs
+
+<VirtualHost *:443>
+ ServerName icinga-admin.wikimedia.org
+ 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
+ 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 "Icinga Access"
+ AuthType Basic
+ AuthUserFile /etc/icinga/htpasswd.users
+ require valid-user
+ </DirectoryMatch>
+ <IfModule !mod_alias.c>
+ LoadModule alias_module modules/mod_alias.so
+ </IfModule>
+
+ ErrorLog /var/log/apache2/icinga.log
+ LogLevel warn
+
+</VirtualHost>
+
diff --git a/files/apache/sites/icinga.wikimedia.org
b/files/apache/sites/icinga.wikimedia.org
index 0359bcf..07203a0 100644
--- a/files/apache/sites/icinga.wikimedia.org
+++ b/files/apache/sites/icinga.wikimedia.org
@@ -25,14 +25,7 @@
SSLRequireSSL
Options ExecCGI
DirectoryIndex index.html
-# AllowOverride None
- AllowOverride AuthConfig
- Order Allow,Deny
- Allow From All
- AuthName "Icinga Access"
- AuthType Basic
- AuthUserFile /etc/icinga/htpasswd.users
- require valid-user
+ AllowOverride None
</DirectoryMatch>
<IfModule !mod_alias.c>
LoadModule alias_module modules/mod_alias.so
--
To view, visit https://gerrit.wikimedia.org/r/51063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac1ebe63d3039c32f108095e287eb5eafd849223
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr <[email protected]>
Gerrit-Reviewer: Lcarr <[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
