Merge pull request #311 from alexskr/master

add location_allow/deny directives for alias and stub_status templates
voxpupuli · May 16, 2014 · 5056ecb · 5056ecb
2 parents 8b7588d + 31f2cce
commit 5056ecb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/templates/vhost/vhost_location_alias.erb b/templates/vhost/vhost_location_alias.erb
@@ -1,4 +1,10 @@
   location <%= @location %> {
+<% if @location_allow -%><% @location_allow.each do |allow_rule| -%>
+    allow <%= allow_rule %>;
+<% end -%><% end -%>
+<% if @location_deny -%><% @location_deny.each do |deny_rule| -%>
+    deny <%= deny_rule %>;
+<% end -%><% end -%>
 <% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
 <% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
 <% Array(subvalue).each do |asubvalue| -%>

diff --git a/templates/vhost/vhost_location_stub_status.erb b/templates/vhost/vhost_location_stub_status.erb
@@ -1,4 +1,10 @@
   location <%= @location %> {
+<% if @location_allow -%><% @location_allow.each do |allow_rule| -%>
+    allow <%= allow_rule %>;
+<% end -%><% end -%>
+<% if @location_deny -%><% @location_deny.each do |deny_rule| -%>
+    deny <%= deny_rule %>;
+<% end -%><% end -%>
 <% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
 <% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
 <% Array(subvalue).each do |asubvalue| -%>