From: Stephen Gran <steve@lobefin.net>
Date: Fri, 18 May 2012 19:52:47 +0000 (+0100)
Subject: Revert "we can use our own idiom"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=859f4bf4e65ed3955958b9d5b213e619884622e3;p=mirror%2Fdsa-puppet.git

Revert "we can use our own idiom"

This reverts commit 9041cedfeb58ddc5340713c709e6c8decd86cbbd.
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index dec6a4a2f..d2e499837 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -69,9 +69,11 @@ 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'],
 		}
 	}