X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=dec3162d6d6a3c2873145bd169c42806a77c7ff4;hb=d3cb659116b7c5d4ed4b24da4d1f95a2538db8fe;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..dec3162d6 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -22,13 +22,21 @@ class apache2 {
 	}
 
 	apache2::config { 'ressource-limits':
-		content => template('apache2/ressource-limits.erb'),
+		ensure => absent,
+	}
+
+	apache2::config { 'resource-limits':
+		content => template('apache2/resource-limits.erb'),
 	}
 
 	apache2::config { 'security':
 		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',
 	}
@@ -64,20 +72,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,powell,beach,buxtehude] {
+	if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':