From b534b72a2fbee24acce97e4ef0d365abd89d1c5c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 8 Nov 2009 11:51:34 -0200
Subject: Website template fix

---
 manifests/init.pp     |  2 +-
 templates/website.erb | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 templates/website.erb

diff --git a/manifests/init.pp b/manifests/init.pp
index b944e07..73852f1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -78,7 +78,7 @@ class apache {
               $protocol = 'http', $server_alias = false, $use = false) {
     file { "${apache2_sites}-available/$title":
       ensure  => $ensure,
-      content => template('apache/website.erb'),
+      content => template('apache/site.erb'),
       owner   => root,
       group   => root,
       mode    => 0644,
diff --git a/templates/website.erb b/templates/website.erb
deleted file mode 100644
index 0c9d075..0000000
--- a/templates/website.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-# begin vhost for <%= title %>
-<VirtualHost *:80>
-   ServerName <%= title %>.<%= domain %>
-<% if server_alias != false %>   ServerAlias <%= server_alias %><% end %>
-   DocumentRoot <%= docroot %>
-<% if redirect != false %>   RedirectMatch ^/$ <%= protocol %>://<%= title %>.<%= domain %>/<%= redirect %><% end %>
-<% if use != false %>
-<% use.each do |instance| -%>   Use <%= instance %><% end -%>
-<% end -%>
-</VirtualHost>
-# end vhost for <%= title %>
-- 
cgit v1.2.3