class apache2 {
-
package { 'apache2':
ensure => installed,
}
apache2::module { 'info': }
apache2::module { 'status': }
+ apache2::module { 'headers': }
+
+ package { 'libapache2-mod-macro':
+ ensure => installed
+ }
+
+ apache2::module { 'macro':
+ require => Package['libapache2-mod-macro']
+ }
apache2::site { '00-default':
site => 'default-debian.org',
}
apache2::config { 'ressource-limits':
- content => template('apache2/ressource-limits.erb'),
+ ensure => absent,
+ }
+
+ if has_role('buildd_master') {
+ $memlimit = 192 * 1024 * 1024
+ } elsif has_role('nagiosmaster') {
+ $memlimit = 96 * 1024 * 1024
+ } elsif has_role('packagesqamaster') {
+ $memlimit = 192 * 1024 * 1024
+ } else {
+ $memlimit = 32 * 1024 * 1024
+ }
+
+ apache2::config { 'resource-limits':
+ content => template('apache2/resource-limits.erb'),
}
apache2::config { 'security':
source => 'puppet:///modules/apache2/server-status',
}
+ apache2::config { 'puppet-ssl-macros':
+ source => 'puppet:///modules/apache2/puppet-ssl-macros',
+ }
+
file { '/etc/apache2/sites-available/common-ssl.inc':
- source => 'puppet:///modules/apache2/common-ssl.inc',
- require => Package['apache2'],
- notify => Service['apache2'],
+ ensure => absent,
}
file { '/etc/logrotate.d/apache2':
content => template('apache2/default-index.html'),
}
+ file { '/var/log/apache2/.nobackup':
+ mode => '0644',
+ content => '',
+ }
+
munin::check { 'apache_accesses': }
munin::check { 'apache_processes': }
munin::check { 'apache_volume': }
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,beach,buxtehude,picconi] {
+ if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':