puppet 4 foo

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index a3db477..19400ad 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -16,17 +16,11 @@ class apache2 {
                require => Package['apache2'],
        }
 
+       apache2::module { 'reqtimeout': }
        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',
@@ -96,10 +90,22 @@ class apache2 {
        }
 
        apache2::config { 'pratchett':
-               source => 'puppet:///modules/apache2/pratchett',
+               ensure => 'absent',
        }
 
-       if $::lsbmajdistrelease > 7 {
+       apache2::config { 'headers':
+               source => 'puppet:///modules/apache2/headers',
+       }
+
+       apache2::module { 'mpm_event': ensure => absent }
+       if has_role('apache_prefork') {
+               apache2::module { 'mpm_worker': ensure => absent }
+               apache2::module { 'mpm_prefork': }
+       } else {
+               apache2::module { 'mpm_prefork': 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 +144,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':
@@ -163,19 +173,8 @@ class apache2 {
                require =>  Package['apache2'],
        }
 
-       concat { '/etc/apache2/conf-available/puppet-ssl-key-pins.conf':
-               owner   => root,
-               group   => root,
-               mode    => '0644',
-               require =>  Package['apache2'],
-               notify  => Exec['service apache2 reload'],
-       }
-       concat::fragment { 'puppet-ssl-key-pins-header':
-               target => '/etc/apache2/conf-available/puppet-ssl-key-pins.conf',
-               content => '',
-               order  => 00,
-       }
        apache2::config { 'puppet-ssl-key-pins':
-               nocontentok => true,
+               content => template('apache2/ssl-key-pins.erb'),
+               notify  => Exec['service apache2 reload'],
        }
 }