7be12d0870
- added raw_prepend / raw_append to vhosts & locations, which
adds raw lines to the vhost/location /without/ semicolons
- added location_raw_prepend / location_raw_append to vhost
for passing through to default location
- added spec tests for new parameters
- cleaned up location specs to match new header/body/footer setup
reducing duplicate checks by testing header/footer separately.
- cleaned up whitespace (2 space) in touched files
- used `<%-` in erb templates to allow the use of leading
whitespace, making the logic flow more readable
- Also adds spec tests for recent vhost updates:
- client_body_timeout
- client_header_timeout
- gzip_types
- testing that the first server_name is used when www_to_non_www is true
49 lines
1.4 KiB
Text
49 lines
1.4 KiB
Text
location <%= @location %> {
|
|
<% if @internal -%>
|
|
internal;
|
|
<% end -%>
|
|
<% 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| -%>
|
|
<%= key %> <%= subkey %> <%= asubvalue %>
|
|
<%- end -%>
|
|
<%- end -%>
|
|
<%- else -%>
|
|
<%- Array(value).each do |asubvalue| -%>
|
|
<%= key %> <%= asubvalue %>
|
|
<%- end -%>
|
|
<%- end -%>
|
|
<%- end -%>
|
|
<% end -%>
|
|
<% if @location_cfg_prepend -%>
|
|
<%- @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
|
|
<%- if value.is_a?(Hash) -%>
|
|
<%- value.each do |subkey,subvalue| -%>
|
|
<%- Array(subvalue).each do |asubvalue| -%>
|
|
<%= key %> <%= subkey %> <%= asubvalue %>;
|
|
<%- end -%>
|
|
<%- end -%>
|
|
<%- else -%>
|
|
<%- Array(value).each do |asubvalue| -%>
|
|
<%= key %> <%= asubvalue %>;
|
|
<%- end -%>
|
|
<%- end -%>
|
|
<%- end -%>
|
|
<% end -%>
|
|
<% if @raw_prepend && Array(@raw_prepend).size > 0 %>
|
|
<%- Array(@raw_prepend).each do |line| -%>
|
|
<%= line %>
|
|
<%- end -%>
|
|
<% end %>
|