X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=b89bafe12bda6805c7b92ad3df8b83081c70847e;hb=81539d50730aeffc1418d8f597a90587ba1594a0;hp=3c0874e3a243b3abda18173ce0df1ef630e5338f;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 3c0874e3a..b89bafe12 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':
@@ -22,19 +22,19 @@ class apache2 {
 	}
 
 	apache2::config { 'ressource-limits':
-		template => 'apache2/ressource-limits.erb',
+		content => template('apache2/ressource-limits.erb'),
 	}
 
 	apache2::config { 'security':
-		config => 'puppet:///modules/apache2/security',
+		source => 'puppet:///modules/apache2/security',
 	}
 
 	apache2::config { 'local-serverinfo':
-		config => 'puppet:///modules/apache2/local-serverinfo',
+		source => 'puppet:///modules/apache2/local-serverinfo',
 	}
 
 	apache2::config { 'server-status':
-		config => 'puppet:///modules/apache2/server-status',
+		source => 'puppet:///modules/apache2/server-status',
 	}
 
 	file { '/etc/apache2/sites-available/common-ssl.inc':
@@ -77,7 +77,7 @@ class apache2 {
 		}
 	}
 
-	if $::hostname in [busoni,duarte,holter,lindberg,master,powell,rore] {
+	if $::hostname in [busoni,duarte,holter,lindberg,master,powell,beach,buxtehude,widor] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':