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
115 lines
4.2 KiB
Text
115 lines
4.2 KiB
Text
<% if @rewrite_www_to_non_www -%>
|
|
server {
|
|
listen <%= @listen_ip %>:<%= @ssl_port %> ssl;
|
|
server_name www.<%= @server_name[0].gsub(/^www\./, '') %>;
|
|
return 301 https://<%= @server_name[0].gsub(/^www\./, '') %>$uri;
|
|
}
|
|
|
|
<% end %>
|
|
server {
|
|
listen <%= @listen_ip %>:<%= @ssl_port %> <% if @ssl_listen_option %>ssl<% end %><% if @spdy == 'on' %> spdy<% end %><% if @listen_options %> <%= @listen_options %><% end %>;
|
|
<%- if @ipv6_enable && (defined? @ipaddress6) %>
|
|
listen [<%= @ipv6_listen_ip %>]:<%= @ssl_port %> ssl<% if @spdy == 'on' %> spdy<% end %><% if @ipv6_listen_options %> <%= @ipv6_listen_options %><% end %>;
|
|
<%- end %>
|
|
server_name <%= @rewrite_www_to_non_www ? @server_name[0].gsub(/^www\./, '') : @server_name.join(" ") %>;
|
|
|
|
ssl on;
|
|
|
|
ssl_certificate <%= scope.lookupvar('nginx::config::conf_dir') %>/<%= @name.gsub(' ', '_') %>.crt;
|
|
ssl_certificate_key <%= scope.lookupvar('nginx::config::conf_dir') %>/<%= @name.gsub(' ', '_') %>.key;
|
|
<% if defined? @ssl_dhparam -%>
|
|
ssl_dhparam <%= scope.lookupvar('nginx::config::conf_dir') %>/<%= @name.gsub(' ', '_') %>.dh.pem;
|
|
<% end -%>
|
|
ssl_session_cache <%= @ssl_cache %>;
|
|
ssl_session_timeout 5m;
|
|
ssl_protocols <%= @ssl_protocols %>;
|
|
ssl_ciphers <%= @ssl_ciphers %>;
|
|
ssl_prefer_server_ciphers on;
|
|
<% if @ssl_stapling -%>
|
|
ssl_stapling on;
|
|
<% end -%>
|
|
<% if defined? @ssl_stapling_file -%>
|
|
ssl_stapling_file <%= scope.lookupvar('nginx::config::conf_dir') %>/<%= @name.gsub(' ', '_') %>.ocsp.resp;
|
|
<% end -%>
|
|
<% if defined? @ssl_stapling_responder -%>
|
|
ssl_stapling_responder <%= @ssl_stapling_responder %>;
|
|
<% end -%>
|
|
<% if @ssl_stapling_verify -%>
|
|
ssl_stapling_verify on;
|
|
<% end -%>
|
|
<% if defined? @ssl_trusted_cert -%>
|
|
ssl_trusted_certificate <%= scope.lookupvar('nginx::config::conf_dir') %>/<%= @name.gsub(' ', '_') %>.trusted.crt;
|
|
<% end -%>
|
|
<% if @resolver.count > 0 -%>
|
|
resolver <% Array(@resolver).each do |r| %> <%= r %><% end %>;
|
|
<% end -%>
|
|
<% if defined? @auth_basic -%>
|
|
auth_basic "<%= @auth_basic %>";
|
|
<% end -%>
|
|
<% if defined? @auth_basic_user_file -%>
|
|
auth_basic_user_file "<%= @auth_basic_user_file %>";
|
|
<% end -%>
|
|
<% if defined? @client_body_timeout -%>
|
|
client_body_timeout <%= @client_body_timeout %>;
|
|
<% end -%>
|
|
<% if defined? @client_header_timeout -%>
|
|
client_header_timeout <%= @client_header_timeout %>;
|
|
<% end -%>
|
|
<% if defined? @client_max_body_size -%>
|
|
client_max_body_size <%= @client_max_body_size %>;
|
|
<% end -%>
|
|
<% if defined? @gzip_types -%>
|
|
gzip_types <%= @gzip_types %>;
|
|
<% end -%>
|
|
<% if @index_files.count > 0 -%>
|
|
index <% Array(@index_files).each do |i| %> <%= i %><% end %>;
|
|
<% end -%>
|
|
|
|
access_log <%= @ssl_access_log_real %>;
|
|
error_log <%= @ssl_error_log_real %>;
|
|
|
|
<% if @vhost_cfg_prepend -%>
|
|
<%- @vhost_cfg_prepend.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 -%>
|
|
<% if @vhost_cfg_ssl_prepend -%>
|
|
<%- @vhost_cfg_ssl_prepend.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_prepend).each do |line| -%>
|
|
<%= line %>
|
|
<% end %>
|
|
<% if @root -%>
|
|
root <%= @root %>;
|
|
<% end -%>
|
|
<% Array(@passenger_cgi_param).each do |key,value| -%>
|
|
passenger_set_cgi_param <%= key %> <%= value %>;
|
|
<% end -%>
|
|
<% Array(@proxy_set_header).each do |header| -%>
|
|
proxy_set_header <%= header %>;
|
|
<% end -%>
|
|
<% Array(@add_header).each do |key,value| -%>
|
|
add_header <%= key %> <%= value %>;
|
|
<% end -%>
|