X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=d8990b1fccc09c061d2ccca3f0e54c250e240941;hb=e95ac9f053c09b0ed797c8b8157cf9b3bf238250;hp=3533856f09e45a836f782f83fef9f3c40b2649ff;hpb=b6295d30f51f50159f4d10328372cf148f9c09a8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 3533856f0..d8990b1fc 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -68,20 +68,7 @@ class apache2 {
 		script => 'ps_',
 	}
 
-	if $php5 {
-		package { 'php5-suhosin':
-			ensure  => installed,
-			require => Package['apache2'],
-		}
-
-		file { '/etc/php5/conf.d/suhosin.ini':
-			source  => 'puppet:///modules/apache2/suhosin.ini',
-			require => Package['php5-suhosin'],
-			notify  => Service['apache2'],
-		}
-	}
-
-	if $::hostname in [busoni,holter,lindberg,master,beach,buxtehude] {
+	if $::hostname in [holter,beach,buxtehude,picconi,pkgmirror-1and1] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':