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

vhost: simplify maintenance variable code
slm0n87 · Apr 14, 2015 · da398ca · da398ca
2 parents cff1c04 + 5aad271
commit da398ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/templates/vhost/vhost_header.erb b/templates/vhost/vhost_header.erb
@@ -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;

diff --git a/templates/vhost/vhost_ssl_header.erb b/templates/vhost/vhost_ssl_header.erb
@@ -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 -%>