Ryan Lane has submitted this change and it was merged.
Change subject: Allow multiple users/groups in access.conf
......................................................................
Allow multiple users/groups in access.conf
Change-Id: Ic15f9d9fd59f2f10b3fd536631e0754493992e14
---
M templates/ldap/access.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ryan Lane: Verified; Looks good to me, approved
diff --git a/templates/ldap/access.conf.erb b/templates/ldap/access.conf.erb
index a4dfb13..583816e 100644
--- a/templates/ldap/access.conf.erb
+++ b/templates/ldap/access.conf.erb
@@ -1,6 +1,6 @@
# Disallow access to all forms of login to all
# users except for members of the nova project
# that this instance is a member of:
-<% if has_variable?("restricted_from") %>-:(<%= restricted_from %>):ALL<% end
%>
-<% if has_variable?("restricted_to") %>-:ALL EXCEPT (<%= restricted_to %>)
root:ALL
+<% if has_variable?("restricted_from") %>-:<%= restricted_from %>:ALL<% end %>
+<% if has_variable?("restricted_to") %>-:ALL EXCEPT <%= restricted_to %>
root:ALL
<% else %>-:ALL EXCEPT (<%= projectgroup %>) root:ALL<% end %>
--
To view, visit https://gerrit.wikimedia.org/r/53844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic15f9d9fd59f2f10b3fd536631e0754493992e14
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
