summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-06 19:46:56 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-06 19:46:56 -0300
commita17bf3f7ab0d578a14b59847472647c4701f0ff1 (patch)
treedc7b6a18eeac9d7639cced6daac74c02d82819e3 /templates
parent591c915b3b7bc69e5ea4dbb4a97d42d2b28acae7 (diff)
downloadpuppet-apache-a17bf3f7ab0d578a14b59847472647c4701f0ff1.tar.gz
puppet-apache-a17bf3f7ab0d578a14b59847472647c4701f0ff1.tar.bz2
Templating fix (3)
Diffstat (limited to 'templates')
-rw-r--r--templates/site.erb8
1 files changed, 5 insertions, 3 deletions
diff --git a/templates/site.erb b/templates/site.erb
index acd5c33..34d1b06 100644
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -32,7 +32,9 @@
RewriteCond %{HTTP_HOST} !=<%= canonical %> [NC]
RewriteCond %{HTTP_HOST} !=""
RewriteRule ^/(.*) <%= protocol %>://<%= canonical %>/$1 [L,R=301]
-<%- if custom_directives != false -%><%= custom_directives %><%- end -%>
+<%- if custom_directives != false -%>
+ <%= custom_directives %>
+<%- end -%>
<% end %>
</VirtualHost>
# end vhost for <%= title %>
@@ -50,9 +52,9 @@
<% if use != false %><% use.each do |instance| -%>
Use <%= instance %>
<% end -%><% end -%>
-<% if custom_directives != false %>
+<%- if custom_directives != false -%>
<%= custom_directives %>
-<% end %>
+<%- end -%>
<% if mpm == true %>
<IfModule mpm_itk_module>
AssignUserId <%= user %> <%= gid %>