Use mpm_worker over mpm_event

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 373b8fe..630d845 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -19,14 +19,7 @@ class apache2 {
        apache2::module { 'info': }
        apache2::module { 'status': }
        apache2::module { 'headers': }
-
-       package { 'libapache2-mod-macro':
-               ensure => installed
-       }
-
-       apache2::module { 'macro':
-               require => Package['libapache2-mod-macro']
-       }
+       apache2::module { 'macro': }
 
        apache2::site { '00-default':
                site     => 'default-debian.org',
@@ -99,6 +92,8 @@ class apache2 {
                source => 'puppet:///modules/apache2/pratchett',
        }
 
+       apache2::module { 'mpm_event': ensure => absent }
+       apache2::module { 'mpm_worker': }
        if $::lsbmajdistrelease > 7 {
                file { '/etc/apache2/mods-available/mpm_worker.conf':
                        content => template('apache2/mpm_worker.erb'),
@@ -138,8 +133,12 @@ class apache2 {
        munin::check { 'ps_apache2':
                script => 'ps_',
        }
+       # The munin script needs this
+       package { 'libwww-perl':
+               ensure => installed,
+       }
 
-       if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1,pkgmirror-csail] {
+       if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
                include apache2::dynamic
        } else {
                @ferm::rule { 'dsa-http':