From cb1cd6c04051d3ccb7ed74112e9019dcc5f22b8b Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 20 Feb 2010 12:45:57 +0000 Subject: [PATCH] why do you try to hurt me, oh puppet? Signed-off-by: Stephen Gran --- modules/apache2/manifests/init.pp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index bccbd916c..f58b71052 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -10,6 +10,12 @@ class apache2 { "true": { package { "php5-suhosin": ensure => installed; } + file { "/etc/php5/conf.d/suhosin.ini": + source => [ "puppet:///apache2/per-host/$fqdn/etc/php5/conf.d/suhosin.ini", + "puppet:///apache2/common/etc/php5/conf.d/suhosin.ini" ], + require => Package["apache2", "php5-suhosin"], + notify => Exec["force-reload-apache2"]; + } } } @@ -66,16 +72,6 @@ class apache2 { "000-default": ensure => absent; } - case $php5suhosin { - "true": { file { "/etc/php5/conf.d/suhosin.ini": - source => [ "puppet:///apache2/per-host/$fqdn/etc/php5/conf.d/suhosin.ini", - "puppet:///apache2/common/etc/php5/conf.d/suhosin.ini" ], - require => Package["apache2", "php5-suhosin"], - notify => Exec["force-reload-apache2"]; - } - } - } - file { "/etc/apache2/conf.d/ressource-limits": content => template("apache2/ressource-limits.erb"), -- 2.20.1