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

Merge pull request #606 from 3flex/602-fix-redundant-code

Browse source 
vhost: simplify maintenance variable code
This commit is contained in:
Matthew Haughton 2015-04-14 11:05:35 -04:00
commit 143e840ed1
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
templates/vhost/vhost_header.erb
View file

@ -103,13 +103,8 @@ server {
<%- end -%>
<% end -%>
<% if @maintenance -%>
set $maintenance "on";
<% else -%>
set $maintenance "off";
<%= @maintenance_value %>;
<% end -%>
if ($maintenance = "on") {
<%= @maintenance_value %>;
}
<% if @rewrite_to_https -%>
if ($ssl_protocol = "") {
return 301 https://$host<% if @ssl_port.to_i != 443 %>:<%= @ssl_port %><% end %>$request_uri;

7
templates/vhost/vhost_ssl_header.erb
View file

@ -77,13 +77,8 @@ server {
<% end -%>
<% if @maintenance -%>
set $maintenance "on";
<% else -%>
set $maintenance "off";
<%= @maintenance_value %>;
<% end -%>
if ($maintenance = "on") {
<%= @maintenance_value %>;
}
<% if Array(@resolver).count > 0 -%>
resolver <% Array(@resolver).each do |r| %> <%= r %><% end %>;
<% end -%>