[MediaWiki-commits] [Gerrit] Temporarily lock-down Icinga Web UI - change (operations/puppet)

2013-12-12 Thread Faidon Liambotis (Code Review)
Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/100989


Change subject: Temporarily lock-down Icinga Web UI
..

Temporarily lock-down Icinga Web UI

Change-Id: Ie923025b301e6628b01124461dd32a8c1dfe5c40
---
M templates/apache/sites/icinga.wikimedia.org.erb
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/100989/1

diff --git a/templates/apache/sites/icinga.wikimedia.org.erb 
b/templates/apache/sites/icinga.wikimedia.org.erb
index 5403427..a0d165f 100644
--- a/templates/apache/sites/icinga.wikimedia.org.erb
+++ b/templates/apache/sites/icinga.wikimedia.org.erb
@@ -34,6 +34,15 @@
Options ExecCGI
DirectoryIndex index.html
AllowOverride None
+   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://virt0.wikimedia.org 
virt1000.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

-- 
To view, visit https://gerrit.wikimedia.org/r/100989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie923025b301e6628b01124461dd32a8c1dfe5c40
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Temporarily lock-down Icinga Web UI - change (operations/puppet)

2013-12-12 Thread Faidon Liambotis (Code Review)
Faidon Liambotis has submitted this change and it was merged.

Change subject: Temporarily lock-down Icinga Web UI
..


Temporarily lock-down Icinga Web UI

Change-Id: Ie923025b301e6628b01124461dd32a8c1dfe5c40
---
M templates/apache/sites/icinga.wikimedia.org.erb
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Faidon Liambotis: 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 5403427..a0d165f 100644
--- a/templates/apache/sites/icinga.wikimedia.org.erb
+++ b/templates/apache/sites/icinga.wikimedia.org.erb
@@ -34,6 +34,15 @@
Options ExecCGI
DirectoryIndex index.html
AllowOverride None
+   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://virt0.wikimedia.org 
virt1000.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

-- 
To view, visit https://gerrit.wikimedia.org/r/100989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie923025b301e6628b01124461dd32a8c1dfe5c40
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits