Lcarr has submitted this change and it was merged.
Change subject: tell users which username to use for LDAP auth
......................................................................
tell users which username to use for LDAP auth
users log in in with creds where "username" is ambiguous.
tell them which one to use.
rename graphite apache template to .erb
Change-Id: Ie105ea084cf3290dd4d85b856c279896836a9d66
---
M manifests/misc/noc.pp
R templates/apache/sites/graphite.wikimedia.org.erb
M templates/apache/sites/icinga.wikimedia.org.erb
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
Lcarr: Verified; Looks good to me, approved
diff --git a/manifests/misc/noc.pp b/manifests/misc/noc.pp
index 9232300..839a5c6 100644
--- a/manifests/misc/noc.pp
+++ b/manifests/misc/noc.pp
@@ -20,7 +20,7 @@
source =>
"puppet:///files/apache/sites/noc.wikimedia.org";
"/etc/apache2/sites-available/graphite.wikimedia.org":
path =>
"/etc/apache2/sites-available/graphite.wikimedia.org",
- content =>
template('apache/sites/graphite.wikimedia.org'),
+ content =>
template('apache/sites/graphite.wikimedia.org.erb'),
mode => 0440,
owner => root,
group => www-data;
diff --git a/templates/apache/sites/graphite.wikimedia.org
b/templates/apache/sites/graphite.wikimedia.org.erb
similarity index 95%
rename from templates/apache/sites/graphite.wikimedia.org
rename to templates/apache/sites/graphite.wikimedia.org.erb
index e51a10a..da012d2 100644
--- a/templates/apache/sites/graphite.wikimedia.org
+++ b/templates/apache/sites/graphite.wikimedia.org.erb
@@ -15,7 +15,7 @@
Order allow,deny
Allow from all
- AuthName "WMF Labs"
+ AuthName "WMF Labs (use wiki login name not shell)"
AuthType Basic
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
@@ -79,7 +79,7 @@
Order allow,deny
Allow from all
- AuthName "WMF Labs"
+ AuthName "WMF Labs (use wiki login name not shell)"
AuthType Basic
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
diff --git a/templates/apache/sites/icinga.wikimedia.org.erb
b/templates/apache/sites/icinga.wikimedia.org.erb
index b4219cd..de65f37 100644
--- a/templates/apache/sites/icinga.wikimedia.org.erb
+++ b/templates/apache/sites/icinga.wikimedia.org.erb
@@ -101,7 +101,7 @@
AllowOverride AuthConfig
Order Allow,Deny
Allow From All
- AuthName "WMF Labs"
+ AuthName "WMF Labs (use wiki login name not shell)"
AuthType Basic
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
--
To view, visit https://gerrit.wikimedia.org/r/57754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie105ea084cf3290dd4d85b856c279896836a9d66
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jeremyb <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Greg Grossmeier <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
