class documentation

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 1f232b9..dec3162 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -22,7 +22,11 @@ class apache2 {
        }
 
        apache2::config { 'ressource-limits':
-               content => template('apache2/ressource-limits.erb'),
+               ensure => absent,
+       }
+
+       apache2::config { 'resource-limits':
+               content => template('apache2/resource-limits.erb'),
        }
 
        apache2::config { 'security':
@@ -68,20 +72,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 [beach,buxtehude,picconi,pkgmirror-1and1] {
                include apache2::dynamic
        } else {
                @ferm::rule { 'dsa-http':