summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2011-04-01 00:15:15 +0200
committermh <mh@immerda.ch>2011-04-01 00:15:15 +0200
commit7f254be7d55f2208f3ea7e2fe6d40284f92e04c8 (patch)
treebea6b3578ffa7f5f1e4bd1a4c202cf9685cc52cf /templates
parent6d15c46f1ff399526ef4768a9bc21ed60940fe8b (diff)
fix template error
Diffstat (limited to 'templates')
-rw-r--r--templates/vhosts/partials/authentication.erb2
-rw-r--r--templates/vhosts/passenger/partial.erb3
2 files changed, 2 insertions, 3 deletions
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