# include apache2
#
class apache2 {
+ include webserver
+
package { 'apache2':
ensure => installed,
}
ensure => absent,
}
- apache2::config { 'ressource-limits':
- ensure => absent,
- }
-
if has_role('udd') {
$memlimit = 512 * 1024 * 1024
} elsif has_role('dgit_git') {
} else {
$memlimit = 192 * 1024 * 1024
}
+ # debbugs cgis like to fork and don't deal well with EAGAIN
+ if has_role('bugs_base') {
+ $proclimit = 450
+ } else {
+ $proclimit = 256
+ }
apache2::config { 'resource-limits':
content => template('apache2/resource-limits.erb'),
content => template('apache2/puppet-config.erb'),
}
- apache2::config { 'pratchett':
- ensure => 'absent',
- }
-
apache2::config { 'headers':
source => 'puppet:///modules/apache2/headers',
}
+ apache2::config { 'disabled-service':
+ source => 'puppet:///modules/apache2/disabled-service',
+ }
+
apache2::module { 'mpm_event': ensure => absent }
if has_role('apache_prefork') {
apache2::module { 'mpm_worker': ensure => absent }
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'),
- }
- }
-
- file { '/etc/apache2/sites-available/common-ssl.inc':
- ensure => absent,
+ file { '/etc/apache2/mods-available/mpm_worker.conf':
+ content => template('apache2/mpm_worker.erb'),
}
file { '/etc/logrotate.d/apache2':
source => 'puppet:///modules/apache2/apache2.logrotate',
}
- file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs', '/srv/www/default.debian.org/htdocs-disabled' ]:
- ensure => directory,
- mode => '0755',
- }
-
- file { '/srv/www/default.debian.org/htdocs/index.html':
- content => template('apache2/default-index.html'),
- }
-
- file { '/srv/www/default.debian.org/htdocs-disabled/index.html':
- content => template('apache2/disabled-index.html'),
- }
-
file { '/var/log/apache2':
ensure => directory,
mode => '0755',
ensure => installed,
}
- if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
- include apache2::dynamic
- } else {
- @ferm::rule { 'dsa-http':
- prio => '23',
- description => 'Allow web access',
- rule => '&SERVICE(tcp, (http https))'
+ if (! has_role('apache_not_public')) {
+ if has_role('apache_ratelimited') {
+ include apache2::dynamic
+ } else {
+ @ferm::rule { 'dsa-http':
+ prio => '23',
+ description => 'Allow web access',
+ rule => '&SERVICE(tcp, (http https))'
+ }
+
+ @ferm::rule { 'dsa-http-v6':
+ domain => '(ip6)',
+ prio => '23',
+ description => 'Allow web access',
+ rule => '&SERVICE(tcp, (http https))'
+ }
}
}
- @ferm::rule { 'dsa-http-v6':
- domain => '(ip6)',
- prio => '23',
- description => 'Allow web access',
- rule => '&SERVICE(tcp, (http https))'
- }
-
exec { 'service apache2 reload':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
command => 'service apache2 reload',
content => template('apache2/ssl-key-pins.erb'),
notify => Exec['service apache2 reload'],
}
+
+ apache2::config { 'local-scheduled-shutdown':
+ source => 'puppet:///modules/apache2/local-scheduled-shutdown',
+ }
}