From 7f254be7d55f2208f3ea7e2fe6d40284f92e04c8 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 1 Apr 2011 00:15:15 +0200
Subject: fix template error

---
 templates/vhosts/partials/authentication.erb | 2 +-
 templates/vhosts/passenger/partial.erb       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/vhosts/partials/authentication.erb b/templates/vhosts/partials/authentication.erb
index bf871e7..b038eb6 100644
--- a/templates/vhosts/partials/authentication.erb
+++ b/templates/vhosts/partials/authentication.erb
@@ -1,4 +1,4 @@
-        <%- unless htpasswd_file.to_s == 'absent' then -%>
+        <%- unless htpasswd_file.to_s == 'absent' -%>
         AuthType Basic
         AuthName "Access fuer <%= servername %>"
         AuthUserFile <%= real_htpasswd_path %>
diff --git a/templates/vhosts/passenger/partial.erb b/templates/vhosts/passenger/partial.erb
index 63f1b89..3b314ce 100644
--- a/templates/vhosts/passenger/partial.erb
+++ b/templates/vhosts/passenger/partial.erb
@@ -1,7 +1,6 @@
   <Directory <%= documentroot %>/>
         AllowOverride <%= allow_override %>
-        Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- unless !options.to_s.include?('MultiViews') then -%> -MultiViews<%- end -%>
+        Options <%- unless options.to_s == 'absent' -%><%= options %><%- end -%><%- unless !options.to_s.include?('MultiViews') -%>-MultiViews<%- end -%>
 
-        <%- end -%>        
 <%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
   </Directory>
\ No newline at end of file
-- 
cgit v1.2.3