[MediaWiki-commits] [Gerrit] graphite: use both virt0/virt1000 for AuthLDAPURL - change (operations/puppet)

2014-01-03 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review.

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


Change subject: graphite: use both virt0/virt1000 for AuthLDAPURL
..

graphite: use both virt0/virt1000 for AuthLDAPURL

virt1000 seems to be down atm, so authentication fails and 500s are
being thrown. We should use both, as this is the only way we provide
redundancy so far.

Change-Id: Id461df5c32e6959e781324b1f713b6b2ef4f0100
---
M templates/graphite/graphite.apache.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/105381/1

diff --git a/templates/graphite/graphite.apache.erb 
b/templates/graphite/graphite.apache.erb
index 008719b..ff16c3f 100644
--- a/templates/graphite/graphite.apache.erb
+++ b/templates/graphite/graphite.apache.erb
@@ -14,7 +14,7 @@
 AuthBasicProvider ldap
 AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
 AuthLDAPBindPassword %= 
scope.lookupvar('::passwords::ldap::production::proxypass') %
-AuthLDAPURL 
ldaps://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
 
 # uWSGI reverse-proxy

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id461df5c32e6959e781324b1f713b6b2ef4f0100
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] graphite: use both virt0/virt1000 for AuthLDAPURL - change (operations/puppet)

2014-01-03 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has submitted this change and it was merged.

Change subject: graphite: use both virt0/virt1000 for AuthLDAPURL
..


graphite: use both virt0/virt1000 for AuthLDAPURL

virt1000 seems to be down atm, so authentication fails and 500s are
being thrown. We should use both, as this is the only way we provide
redundancy so far.

Change-Id: Id461df5c32e6959e781324b1f713b6b2ef4f0100
---
M templates/graphite/graphite.apache.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/templates/graphite/graphite.apache.erb 
b/templates/graphite/graphite.apache.erb
index 008719b..ff16c3f 100644
--- a/templates/graphite/graphite.apache.erb
+++ b/templates/graphite/graphite.apache.erb
@@ -14,7 +14,7 @@
 AuthBasicProvider ldap
 AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
 AuthLDAPBindPassword %= 
scope.lookupvar('::passwords::ldap::production::proxypass') %
-AuthLDAPURL 
ldaps://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
 
 # uWSGI reverse-proxy

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

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

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