X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=1f232b931f49d18654bd5cfeba0c54eb47e004d3;hb=db14d5ab5528a3d2be5b8e32ba4ce4ca28963bdc;hp=8c1afa14e76fc93bfbb5221f8b0a5fc32846b42f;hpb=6243dfbd2b59c54c1de67a526046227092aa0f1f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 8c1afa14e..1f232b931 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,23 @@ 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 { 'logformat-privacy':
+		source => 'puppet:///modules/apache2/logformat-privacy',
 	}
 
 	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 +81,7 @@ class apache2 {
 		}
 	}
 
-	if $::hostname in [busoni,duarte,holter,lindberg,master,powell] {
+	if $::hostname in [busoni,holter,lindberg,master,powell,beach,buxtehude] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':