opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #104 from stephenrjohnson/vhost_template_cleanup

Browse source 
fix template, should use @
This commit is contained in:
James Fryman 2013-08-22 13:39:59 -07:00
commit b246c13285
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
templates/vhost/vhost_header.erb
View file

@ -1,11 +1,11 @@
server { server {
listen <%= @listen_ip %>:<%= @listen_port %><% if @listen_options %> <%= @listen_options %><% end %>; listen <%= @listen_ip %>:<%= @listen_port %><% if @listen_options %> <%= @listen_options %><% end %>;
<% # check to see if ipv6 support exists in the kernel before applying %> <% # check to see if ipv6 support exists in the kernel before applying %>
<% if @ipv6_enable == 'true' && (defined? ipaddress6) %> <% if @ipv6_enable == 'true' && (defined? @ipaddress6) %>
listen [<%= ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %> ipv6only=on; listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %> ipv6only=on;
<% end %> <% end %>
server_name <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>; server_name <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;
<% if defined? auth_basic -%> <% if defined? @auth_basic -%>
auth_basic "<%= @auth_basic %>"; auth_basic "<%= @auth_basic %>";
<% end -%> <% end -%>
<% if defined? auth_basic_user_file -%> <% if defined? auth_basic_user_file -%>