Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394372 )
Change subject: nslcd.conf: add @ before some erb variables.
......................................................................
nslcd.conf: add @ before some erb variables.
Change-Id: Ia3891ebdfe45efa7bd5c2c18551971d00fab1501
---
M modules/ldap/templates/nslcd.conf.erb
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/394372/1
diff --git a/modules/ldap/templates/nslcd.conf.erb
b/modules/ldap/templates/nslcd.conf.erb
index 1c2258e..f72c9f1 100644
--- a/modules/ldap/templates/nslcd.conf.erb
+++ b/modules/ldap/templates/nslcd.conf.erb
@@ -21,10 +21,10 @@
base shadow <%= @ldapconfig["users_rdn"] %>,ou=servicegroups,<%=
@ldapconfig["basedn"] %>
base group ou=servicegroups,<%= @ldapconfig["basedn"] %>
<% elsif @realm == "labs" -%>
-<% if has_variable?("labsproject") then -%>
-base passwd <%= @ldapconfig["users_rdn"] %>,cn=<%= labsproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
-base shadow <%= @ldapconfig["users_rdn"] %>,cn=<%= labsproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
-base group <%= @ldapconfig["groups_rdn"] %>,cn=<%= labsproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
+<% if has_variable?("@labsproject") then -%>
+base passwd <%= @ldapconfig["users_rdn"] %>,cn=<%= @labsproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
+base shadow <%= @ldapconfig["users_rdn"] %>,cn=<%= @labsproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
+base group <%= @ldapconfig["groups_rdn"] %>,cn=<%= @labsproject
%>,ou=projects,<%= @ldapconfig["basedn"] %>
<% end %><% end -%>
# The DN to bind with for normal lookups.
--
To view, visit https://gerrit.wikimedia.org/r/394372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3891ebdfe45efa7bd5c2c18551971d00fab1501
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
