From fd87aeefb846f7986d936e07fee453fbb25d4833 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 25 Feb 2011 16:13:50 +0100
Subject: cleanup rendering

---
 templates/vhosts/partials/header_default.erb | 14 +++++++-------
 templates/vhosts/partials/logs.erb           | 28 ++++++++++++++--------------
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'templates/vhosts/partials')

diff --git a/templates/vhosts/partials/header_default.erb b/templates/vhosts/partials/header_default.erb
index 968cfeb..4080ac3 100644
--- a/templates/vhosts/partials/header_default.erb
+++ b/templates/vhosts/partials/header_default.erb
@@ -1,12 +1,12 @@
   Include include.d/defaults.inc
-  <%- if vhost_part == :ssl %>
+  <% if vhost_part == :ssl -%>
   Include include.d/ssl_defaults.inc
-  <%- end %>
+  <% end -%>
   ServerName <%= servername %>
-  <%- unless serveralias.to_s.empty? || (serveralias.to_s == 'absent') %>
-  ServerAlias <%= serveralias %>
-  <%- end %>
-  <%- unless server_admin.to_s.empty? || (server_admin.to_s == 'absent') %>
+  <% unless serveralias.to_s.empty? || (serveralias.to_s == 'absent') -%>
+  ServerAlias <%= serveralias -%>
+  <% end -%>
+  <% unless server_admin.to_s.empty? || (server_admin.to_s == 'absent') -%>
   ServerAdmin <%= server_admin %>
-  <%- end %>
+  <% end -%>
   DocumentRoot <%= documentroot %>/
diff --git a/templates/vhosts/partials/logs.erb b/templates/vhosts/partials/logs.erb
index 9b03426..0342c49 100644
--- a/templates/vhosts/partials/logs.erb
+++ b/templates/vhosts/partials/logs.erb
@@ -1,14 +1,14 @@
-    <%- case logmode.to_s
-        when 'nologs' %>
-    ErrorLog /dev/null
-    CustomLog /dev/null
-    <%- when 'semianonym' %>
-    ErrorLog <%= logdir %>/error_log
-    CustomLog <%= logdir %>/access_log noip
-    <%- when 'anonym' %>
-    ErrorLog /dev/null
-    CustomLog <%= logdir %>/access_log noip
-    <%- else %>
-    ErrorLog <%= logdir %>/error_log
-    CustomLog <%= logdir %>/access_log combined
-    <%- end %>
+  <% case logmode.to_s
+      when 'nologs' -%>
+  ErrorLog /dev/null
+  CustomLog /dev/null
+  <% when 'semianonym' -%>
+  ErrorLog <%= logdir %>/error_log
+  CustomLog <%= logdir %>/access_log noip
+  <% when 'anonym' -%>
+  ErrorLog /dev/null
+  CustomLog <%= logdir %>/access_log noip
+  <% else -%>
+  ErrorLog <%= logdir %>/error_log
+  CustomLog <%= logdir %>/access_log combined
+  <% end -%>
-- 
cgit v1.2.3