diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-11-06 10:44:39 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-11-06 10:44:39 -0200 |
| commit | e27ff5d37a5c50db0d4b7e884f212d14f7cb8e74 (patch) | |
| tree | 9c4db032559f2c3850cc365aa2c34a6b88129735 /templates | |
| parent | 64c992ab50814e97c745e789375fc259f3a64692 (diff) | |
| download | puppet-apache-e27ff5d37a5c50db0d4b7e884f212d14f7cb8e74.tar.gz puppet-apache-e27ff5d37a5c50db0d4b7e884f212d14f7cb8e74.tar.bz2 | |
Updating template
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/website.erb | 13 |
1 files changed, 3 insertions, 10 deletions
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 %> |