Website template fix

diff --git a/manifests/init.pp b/manifests/init.pp
index b944e07da4c6f9bb0b18bd124e31476c6a6cd77e..73852f1865c8e05a1c13c00b6d2fca421d304d2a 100644 (file)
--- 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 (file)
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 %>