Dzahn has submitted this change and it was merged.
Change subject: Note which LDAP groups are allowed in HTTP login prompts
mentioning labs
......................................................................
Note which LDAP groups are allowed in HTTP login prompts mentioning labs
Change-Id: I81ebc62cb3a5af5ced764cf3a581465e74b5453c
---
M manifests/role/graphite.pp
M manifests/role/ishmael.pp
M manifests/role/kibana.pp
M manifests/role/tendril.pp
M modules/icinga/templates/icinga.wikimedia.org.erb
M templates/apache/sites/servermon.wikimedia.org.erb
6 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 30b4204..d1029f5 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -189,7 +189,7 @@
'cn=nda,ou=groups,dc=wikimedia,dc=org',
'cn=wmf,ou=groups,dc=wikimedia,dc=org'
]
- $auth_realm = 'WMF Labs (use wiki login name not shell)'
+ $auth_realm = 'WMF Labs (use wiki login name not shell) -
nda/ops/wmf'
$apache_auth = template('graphite/apache-auth-ldap.erb')
}
diff --git a/manifests/role/ishmael.pp b/manifests/role/ishmael.pp
index e61aff8..517a355 100644
--- a/manifests/role/ishmael.pp
+++ b/manifests/role/ishmael.pp
@@ -12,7 +12,7 @@
ldap_binddn => 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org',
ldap_authurl => 'ldaps://ldap-eqiad.wikimedia.org
ldap-codfw.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn',
ldap_groups => [ 'cn=ops,ou=groups,dc=wikimedia,dc=org',
'cn=wmf,ou=groups,dc=wikimedia,dc=org', 'cn=nda,ou=groups,dc=wikimedia,dc=org'
],
- auth_name => 'WMF Labs (use wiki login name not shell)',
+ auth_name => 'WMF Labs (use wiki login name not shell) -
nda/ops/wmf',
}
}
diff --git a/manifests/role/kibana.pp b/manifests/role/kibana.pp
index 625773b..484c9cb 100644
--- a/manifests/role/kibana.pp
+++ b/manifests/role/kibana.pp
@@ -53,7 +53,7 @@
'cn=nda,ou=groups,dc=wikimedia,dc=org',
'cn=wmf,ou=groups,dc=wikimedia,dc=org',
]
- $auth_realm = 'WMF Labs (use wiki login name not shell)'
+ $auth_realm = 'WMF Labs (use wiki login name not shell) -
nda/ops/wmf'
$apache_auth = template('kibana/apache-auth-ldap.erb')
}
$es_host = '127.0.0.1'
diff --git a/manifests/role/tendril.pp b/manifests/role/tendril.pp
index b657369..51f1c91 100644
--- a/manifests/role/tendril.pp
+++ b/manifests/role/tendril.pp
@@ -18,7 +18,7 @@
'cn=nda,ou=groups,dc=wikimedia,dc=org',
'cn=wmf,ou=groups,dc=wikimedia,dc=org',
],
- auth_name => 'WMF Labs (use wiki login name not shell)',
+ auth_name => 'WMF Labs (use wiki login name not shell) -
nda/ops/wmf',
}
}
diff --git a/modules/icinga/templates/icinga.wikimedia.org.erb
b/modules/icinga/templates/icinga.wikimedia.org.erb
index 914c4de..5f39305 100644
--- a/modules/icinga/templates/icinga.wikimedia.org.erb
+++ b/modules/icinga/templates/icinga.wikimedia.org.erb
@@ -35,7 +35,7 @@
AllowOverride None
Order Allow,Deny
Allow From All
- AuthName "WMF Labs (use wiki login name not shell)"
+ AuthName "WMF Labs (use wiki login name not shell) - nda/ops/wmf"
AuthType Basic
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
diff --git a/templates/apache/sites/servermon.wikimedia.org.erb
b/templates/apache/sites/servermon.wikimedia.org.erb
index 35e1905..1fd6d70 100644
--- a/templates/apache/sites/servermon.wikimedia.org.erb
+++ b/templates/apache/sites/servermon.wikimedia.org.erb
@@ -25,7 +25,7 @@
AllowOverride None
Order Allow,Deny
Allow from All
- AuthName "WMF Labs (use wiki login name not shell)"
+ AuthName "WMF Labs (use wiki login name not shell) - ops"
AuthType Basic
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
--
To view, visit https://gerrit.wikimedia.org/r/204291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81ebc62cb3a5af5ced764cf3a581465e74b5453c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: John F. Lewis <johnflewi...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
