coren has submitted this change and it was merged.
Change subject: Labs: Add support for eqiad in /etc/nslcd.conf
......................................................................
Labs: Add support for eqiad in /etc/nslcd.conf
Change-Id: I64e92cf01ced9e09dacdeedead722552dae7a7df
---
M modules/ldap/templates/nslcd.conf.erb
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
ArielGlenn: Looks good to me, but someone else must approve
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ldap/templates/nslcd.conf.erb
b/modules/ldap/templates/nslcd.conf.erb
index 9a6a3bc..2b1bd6f 100644
--- a/modules/ldap/templates/nslcd.conf.erb
+++ b/modules/ldap/templates/nslcd.conf.erb
@@ -16,11 +16,16 @@
base shadow <%= ldapconfig["users_rdn"] %>,<%= ldapconfig["basedn"] %>
base group <%= ldapconfig["groups_rdn"] %>,<%= ldapconfig["basedn"] %>
-<% if realm == "labs" %><% if has_variable?("instanceproject") then %>
+<% if realm == "labs" %><% 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 -%>
+<% 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/113802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64e92cf01ced9e09dacdeedead722552dae7a7df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
