Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/215712
Change subject: ldap-groups: qualify var
......................................................................
ldap-groups: qualify var
bug: T97251
Change-Id: I73adb814edfd74a65533d283cee4b49c5d3aecc0
---
M modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
M modules/tendril/templates/apache/tendril.wikimedia.org.erb
M templates/graphite/apache-auth-ldap.erb
M templates/kibana/apache-auth-ldap.erb
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/215712/1
diff --git a/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
b/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
index b9ed142..a3cf674 100644
--- a/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
+++ b/modules/ishmael/templates/apache/ishmael.wikimedia.org.erb
@@ -26,7 +26,7 @@
AuthLDAPBindDN <%= @ldap_binddn %>
AuthLDAPBindPassword <%= @proxypass %>
AuthLDAPURL "<%= @ldap_authurl %>"
- <% ldap_groups.each do |group| -%>
+ <% @ldap_groups.each do |group| -%>
Require ldap-group <%= group %>
<% end -%>
</Directory>
diff --git a/modules/tendril/templates/apache/tendril.wikimedia.org.erb
b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
index dd72cec..334afbc 100644
--- a/modules/tendril/templates/apache/tendril.wikimedia.org.erb
+++ b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
@@ -27,7 +27,7 @@
AuthLDAPBindDN <%= @ldap_binddn %>
AuthLDAPBindPassword <%= @proxypass %>
AuthLDAPURL "<%= @ldap_authurl %>"
- <% ldap_groups.each do |group| -%>
+ <% @ldap_groups.each do |group| -%>
Require ldap-group <%= group %>
<% end -%>
</Directory>
diff --git a/templates/graphite/apache-auth-ldap.erb
b/templates/graphite/apache-auth-ldap.erb
index ebfa2ea..bdf4caf 100644
--- a/templates/graphite/apache-auth-ldap.erb
+++ b/templates/graphite/apache-auth-ldap.erb
@@ -7,7 +7,7 @@
AuthLDAPURL "<%= @ldap_authurl %>"
<LimitExcept OPTIONS>
- <% ldap_groups.each do |group| -%>
+ <% @ldap_groups.each do |group| -%>
Require ldap-group <%= group %>
<% end -%>
</LimitExcept>
diff --git a/templates/kibana/apache-auth-ldap.erb
b/templates/kibana/apache-auth-ldap.erb
index 758a64e..adaca27 100644
--- a/templates/kibana/apache-auth-ldap.erb
+++ b/templates/kibana/apache-auth-ldap.erb
@@ -4,6 +4,6 @@
AuthLDAPBindDN <%= @ldap_binddn %>
AuthLDAPBindPassword <%= @ldap_bindpass %>
AuthLDAPURL "<%= @ldap_authurl %>"
- <% ldap_groups.each do |group| -%>
+ <% @ldap_groups.each do |group| -%>
Require ldap-group <%= group %>
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/215712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73adb814edfd74a65533d283cee4b49c5d3aecc0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
