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',
}
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 versioncmp($::lsbmajdistrelease, '7') > 0 {
file { '/etc/apache2/mods-available/mpm_worker.conf':
content => template('apache2/mpm_worker.erb'),
}
content => template('apache2/disabled-index.html'),
}
+ file { '/var/log/apache2':
+ ensure => directory,
+ mode => '0755',
+ }
file { '/var/log/apache2/.nobackup':
mode => '0644',
content => '',
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':
refreshonly => true,
require => Package['apache2'],
}
+
+ apache2::config { 'puppet-ssl-key-pins':
+ content => template('apache2/ssl-key-pins.erb'),
+ notify => Exec['service apache2 reload'],
+ }
}