coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113959
Change subject: Labs: Use service groups in eqiad always
......................................................................
Labs: Use service groups in eqiad always
Change-Id: Ifd3a4991a30750dbafcc66161d125e732e84f31d
---
M modules/ldap/templates/nslcd.conf.erb
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/113959/1
diff --git a/modules/ldap/templates/nslcd.conf.erb
b/modules/ldap/templates/nslcd.conf.erb
index eff10ac..4f1e661 100644
--- a/modules/ldap/templates/nslcd.conf.erb
+++ b/modules/ldap/templates/nslcd.conf.erb
@@ -16,16 +16,16 @@
base shadow <%= ldapconfig["users_rdn"] %>,<%= ldapconfig["basedn"] %>
base group <%= ldapconfig["groups_rdn"] %>,<%= ldapconfig["basedn"] %>
-<% if realm == "labs" %><% if site == "eqiad" -%>
+<% if site == "eqiad" -%>
base passwd <%= ldapconfig["users_rdn"] %>,ou=servicegroups,<%=
ldapconfig["basedn"] %>
base shadow <%= ldapconfig["users_rdn"] %>,ou=servicegroups,<%=
ldapconfig["basedn"] %>
base group ou=servicegroups,<%= ldapconfig["basedn"] %>
-<% else -%>
+<% elsif realm == "labs" -%>
<% if has_variable?("instanceproject") then -%>
base passwd <%= ldapconfig["users_rdn"] %>,cn=<%= instanceproject
%>,ou=projects,<%= ldapconfig["basedn"] %>
base shadow <%= ldapconfig["users_rdn"] %>,cn=<%= instanceproject
%>,ou=projects,<%= ldapconfig["basedn"] %>
base group <%= ldapconfig["groups_rdn"] %>,cn=<%= instanceproject
%>,ou=projects,<%= ldapconfig["basedn"] %>
-<% end %><% end %><% end -%>
+<% end %><% end -%>
# The DN to bind with for normal lookups.
binddn cn=proxyagent,ou=profile,<%= ldapconfig["basedn"] %>
--
To view, visit https://gerrit.wikimedia.org/r/113959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd3a4991a30750dbafcc66161d125e732e84f31d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
