Ryan Lane has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51323
Change subject: Use ldaps for virt0/1000 connections
......................................................................
Use ldaps for virt0/1000 connections
Change-Id: I7dd5487093e23bd886db553815174092e31cc24b
---
M templates/apache/sites/graphite.wikimedia.org
M templates/apache/sites/icinga.wikimedia.org.erb
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/51323/1
diff --git a/templates/apache/sites/graphite.wikimedia.org
b/templates/apache/sites/graphite.wikimedia.org
index 86fb6f1..e51a10a 100644
--- a/templates/apache/sites/graphite.wikimedia.org
+++ b/templates/apache/sites/graphite.wikimedia.org
@@ -20,7 +20,7 @@
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
AuthLDAPBindPassword <%= proxypass %>
- AuthLDAPURL "ldap://virt0.wikimedia.org
virt1000.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn"
+ 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
RedirectMatch ^/$ "https://graphite.wikimedia.org/dashboard/";
diff --git a/templates/apache/sites/icinga.wikimedia.org.erb
b/templates/apache/sites/icinga.wikimedia.org.erb
index 48da461..9d7e828 100644
--- a/templates/apache/sites/icinga.wikimedia.org.erb
+++ b/templates/apache/sites/icinga.wikimedia.org.erb
@@ -88,7 +88,7 @@
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
AuthLDAPBindPassword <%= proxypass %>
- AuthLDAPURL "ldap://virt0.wikimedia.org
virt1000.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn"
+ 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>
--
To view, visit https://gerrit.wikimedia.org/r/51323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7dd5487093e23bd886db553815174092e31cc24b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
