Add reject_response and listen_options to ssl header

danjung · Apr 9, 2015 · 9a13558 · 9a13558
1 parent c598bef
commit 9a13558
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/templates/vhost/vhost_header.erb b/templates/vhost/vhost_header.erb
@@ -5,7 +5,9 @@ server {
   listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %> ipv6only=on;
   <% end %>
   server_name           <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;
-<% if @reject_response -%>  return 444;<% end -%>
+<% if @reject_response -%>
+  return 444;
+<% end -%>
   access_log            <%= scope.lookupvar('nginx::params::nx_logdir')%>/<%= @name %>.access.log;
 <% if @server_www_root -%>
   root <%= @server_www_root %>;

diff --git a/templates/vhost/vhost_ssl_header.erb b/templates/vhost/vhost_ssl_header.erb
@@ -1,9 +1,12 @@
 server {
-  listen       <%= @ssl_port %>;
+  listen       <%= @ssl_port %> <% if @listen_options %><%= @listen_options %><% end %>;
   <% if @ipv6_enable && (defined? @ipaddress6) %>
   listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %> ipv6only=on;
   <% end %>
   server_name  <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;
+<% if @reject_response -%>
+  return 444;
+<% end -%>
   access_log <%= scope.lookupvar('nginx::params::nx_logdir') -%>/<%= @name -%>.access.log;
 <% if @server_www_root -%>
   root <%= @server_www_root %>;