generate TLSA record for our mailserver ports

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b89bafe12bda6805c7b92ad3df8b83081c70847e..d8990b1fccc09c061d2ccca3f0e54c250e240941 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',
        }
@@ -64,20 +68,7 @@ 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 [busoni,duarte,holter,lindberg,master,powell,beach,buxtehude,widor] {
+       if $::hostname in [holter,beach,buxtehude,picconi,pkgmirror-1and1] {
                include apache2::dynamic
        } else {
                @ferm::rule { 'dsa-http':