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
27 lines
881 B
Text
27 lines
881 B
Text
<% if @include_files -%>
|
|
<%- @include_files.each do |file| -%>
|
|
include <%= file %>;
|
|
<%- end -%>
|
|
<% end -%>
|
|
<%# make sure that allow comes before deny by forcing the allow key (if it -%>
|
|
<%# exists) to be first in the output order. The hash keys also need to be -%>
|
|
<%# sorted so that the ordering is stable. -%>
|
|
<% if @vhost_cfg_append -%>
|
|
<%- @vhost_cfg_append.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.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 -%>
|
|
<% Array(@raw_append).each do |line| -%>
|
|
<%= line %>
|
|
<% end -%>
|
|
}
|