From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 6 Nov 2009 12:44:39 +0000 (-0200)
Subject: Updating template
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e27ff5d37a5c50db0d4b7e884f212d14f7cb8e74;p=puppet-apache.git

Updating template
---

diff --git a/templates/website.erb b/templates/website.erb
index ac41b9b..0c9d075 100644
--- a/templates/website.erb
+++ b/templates/website.erb
@@ -1,18 +1,11 @@
 # begin vhost for <%= title %>
 <VirtualHost *:80>
    ServerName <%= title %>.<%= domain %>
-<% if server_alias != false %>
-   ServerAlias <%= server_alias %>
-<% end %>
+<% if server_alias != false %>   ServerAlias <%= server_alias %><% end %>
    DocumentRoot <%= docroot %>
-<% if redirect != false %>       
-   RedirectMatch ^/$ <%= protocol %>://<%= title %>.<%= domain %>/<%= redirect %>
-<% end %>
-
+<% if redirect != false %>   RedirectMatch ^/$ <%= protocol %>://<%= title %>.<%= domain %>/<%= redirect %><% end %>
 <% if use != false %>
-  <% use.each do |instance| -%> 
-   Use <%= instance %> 
-  <% end -%>
+<% use.each do |instance| -%>   Use <%= instance %><% end -%>
 <% end -%>
 </VirtualHost>
 # end vhost for <%= title %>