summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-06 17:20:10 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-06 17:20:10 -0300
commit12cdb4bdd7b6f1d67076fdc8e3f5a197e66f615d (patch)
tree95d0409e81e540345617302b2520ca7bb6a08295 /templates
parent30ef26d2b0b19156f134a5b56e5daaabc19db4e7 (diff)
downloadpuppet-apache-12cdb4bdd7b6f1d67076fdc8e3f5a197e66f615d.tar.gz
puppet-apache-12cdb4bdd7b6f1d67076fdc8e3f5a197e66f615d.tar.bz2
Adding additional_directives parameter
Diffstat (limited to 'templates')
-rw-r--r--templates/site.erb2
1 files changed, 2 insertions, 0 deletions
diff --git a/templates/site.erb b/templates/site.erb
index 911d97a..aef58e0 100644
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -32,6 +32,7 @@
RewriteCond %{HTTP_HOST} !=<%= canonical %> [NC]
RewriteCond %{HTTP_HOST} !=""
RewriteRule ^/(.*) <%= protocol %>://<%= canonical %>/$1 [L,R=301]
+<%- if additional_directives != false -%><%= additional_directives %><%- end -%>
<% end %>
</VirtualHost>
# end vhost for <%= title %>
@@ -49,6 +50,7 @@
<% if use != false %><% use.each do |instance| -%>
Use <%= instance %>
<% end -%><% end -%>
+<%- if additional_directives != false -%><%= additional_directives %><%- end -%>
<% if mpm == true %>
<IfModule mpm_itk_module>
AssignUserId <%= user %> <%= gid %>