X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=351acbbbdff0bfb01f5b605293f0445b12102871;hb=bc12cd8473771b6feb8de7d688a783b519311d44;hp=dec6a4a2fdc611bf0cfda444dfc6afa76a215d47;hpb=9041cedfeb58ddc5340713c709e6c8decd86cbbd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index dec6a4a2f..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',
 	}
@@ -69,13 +73,15 @@ class apache2 {
 			ensure  => installed,
 			require => Package['apache2'],
 		}
-		apache2::config { 'suhosin.ini':
-			content => 'puppet:///modules/apache2/suhosin.ini',
+
+		file { '/etc/php5/conf.d/suhosin.ini':
+			source  => 'puppet:///modules/apache2/suhosin.ini',
 			require => Package['php5-suhosin'],
+			notify  => Service['apache2'],
 		}
 	}
 
-	if $::hostname in [busoni,duarte,holter,lindberg,master,powell] {
+	if $::hostname in [holter,beach,buxtehude,picconi,pkgmirror-1and1] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':