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 1f232b931f49d18654bd5cfeba0c54eb47e004d3..d8990b1fccc09c061d2ccca3f0e54c250e240941 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -68,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,holter,lindberg,master,powell,beach,buxtehude] {
+       if $::hostname in [holter,beach,buxtehude,picconi,pkgmirror-1and1] {
                include apache2::dynamic
        } else {
                @ferm::rule { 'dsa-http':