X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=351acbbbdff0bfb01f5b605293f0445b12102871;hb=fe1b4ba5fb5321a98b3270b181f6b22f5ff93931;hp=ef2864e36978ca6dc0f28dc09db4bf7d3adf23ed;hpb=7df87f1f9903d5a71751a9000d8b0a893991ee8a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index ef2864e36..351acbbbd 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -29,6 +29,10 @@ class apache2 {
 		source => 'puppet:///modules/apache2/security',
 	}
 
+	apache2::config { 'logformat-privacy':
+		source => 'puppet:///modules/apache2/logformat-privacy',
+	}
+
 	apache2::config { 'local-serverinfo':
 		source => 'puppet:///modules/apache2/local-serverinfo',
 	}
@@ -77,7 +81,7 @@ class apache2 {
 		}
 	}
 
-	if $::hostname in [busoni,holter,lindberg,master,powell,beach,buxtehude] {
+	if $::hostname in [holter,beach,buxtehude,picconi,pkgmirror-1and1] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':