pick up some other useful rules

[dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index dec6a4a2fdc611bf0cfda444dfc6afa76a215d47..492823da248edd2fc6316fba32c3c63b7a8008e0 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -29,6 +29,10 @@ class apache2 {
                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',
        }
@@ -69,13 +73,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,holter,lindberg,master,beach,buxtehude,picconi] {
                include apache2::dynamic
        } else {
                @ferm::rule { 'dsa-http':