X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=0c15379c85e13446d25580e074709f3163b76a35;hb=a0ae58f07e1d5e2ed987ef4c50e559534796e300;hp=dec6a4a2fdc611bf0cfda444dfc6afa76a215d47;hpb=9041cedfeb58ddc5340713c709e6c8decd86cbbd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index dec6a4a2f..0c15379c8 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -69,13 +69,15 @@ 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'],
 		}
 	}
 
-	if $::hostname in [busoni,duarte,holter,lindberg,master,powell] {
+	if $::hostname in [busoni,duarte,holter,lindberg,master,powell,beach] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':