X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=a7715586fd69c27400a983a0e4dcff0d90e6d213;hb=709438a136ff74644565a7c81ceefb922ca6b519;hp=082b8631ccf5252eeab193e18c66271be3fa35b9;hpb=2ddafbd75b7bde2fac3e5293b824c727c5b3105a;p=dsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 082b8631..a7715586 100644
--- 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,holter,lindberg,master,powell,beach,buxtehude,widor] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':