Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 082b8631ccf5252eeab193e18c66271be3fa35b9..b89bafe12bda6805c7b92ad3df8b83081c70847e 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -14,7 +14,7 @@ class apache2 {
 
        apache2::site { '00-default':
                site     => 'default-debian.org',
-               template => 'apache2/default-debian.org.erb',
+               content  => template('apache2/default-debian.org.erb'),
        }
 
        apache2::site { '000-default':
@@ -77,7 +77,7 @@ class apache2 {
                }
        }
 
-       if $::hostname in [busoni,duarte,holter,lindberg,master,powell] {
+       if $::hostname in [busoni,duarte,holter,lindberg,master,powell,beach,buxtehude,widor] {
                include apache2::dynamic
        } else {
                @ferm::rule { 'dsa-http':