From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 19 May 2013 17:31:08 +0000 (+0200)
Subject: there is no more php5-suhosin
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b135564a1dfab78b25561ed250eda08823ca9e42;p=mirror%2Fdsa-puppet.git

there is no more php5-suhosin
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 351acbbbd..d8990b1fc 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -68,19 +68,6 @@ 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 [holter,beach,buxtehude,picconi,pkgmirror-1and1] {
 		include apache2::dynamic
 	} else {