diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-11-08 11:51:34 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-11-08 11:51:34 -0200 |
| commit | b534b72a2fbee24acce97e4ef0d365abd89d1c5c (patch) | |
| tree | f038f6a2327905d30451f61ab80bdfc31afb1383 | |
| parent | 1f05de76f5ef8350f75bf7b6b27c1ef5a490684e (diff) | |
| download | puppet-apache-b534b72a2fbee24acce97e4ef0d365abd89d1c5c.tar.gz puppet-apache-b534b72a2fbee24acce97e4ef0d365abd89d1c5c.tar.bz2 | |
Website template fix
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | templates/website.erb | 11 |
2 files changed, 1 insertions, 12 deletions
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 %> |