site => 'default-debian.org',
content => template('apache2/default-debian.org.erb'),
}
+ apache2::site { 'xx-default-ssl':
+ site => 'default-debian.org-ssl',
+ content => template('apache2/default-debian.org-ssl.erb'),
+ }
apache2::site { '000-default':
ensure => absent,
ensure => absent,
}
- if has_role('buildd_master') {
- $memlimit = 192 * 1024 * 1024
- } elsif has_role('buildd_ports_master') {
- $memlimit = 192 * 1024 * 1024
- } elsif has_role('nagiosmaster') {
- $memlimit = 96 * 1024 * 1024
- } elsif has_role('packagesqamaster') {
- $memlimit = 192 * 1024 * 1024
- } elsif has_role('nm') {
- $memlimit = 96 * 1024 * 1024
- } elsif has_role('udd') {
+ if has_role('udd') {
$memlimit = 512 * 1024 * 1024
+ } elsif has_role('dgit_git') {
+ $memlimit = 512 * 1024 * 1024
+ } elsif has_role('sso') {
+ $memlimit = 512 * 1024 * 1024
+ } elsif has_role('popcon') {
+ $memlimit = 512 * 1024 * 1024
+ } elsif has_role('qamaster') {
+ $memlimit = 300 * 1024 * 1024
} else {
- $memlimit = 64 * 1024 * 1024
+ $memlimit = 192 * 1024 * 1024
}
apache2::config { 'resource-limits':
source => 'puppet:///modules/apache2/puppet-ssl-macros',
}
+ apache2::config { 'puppet-ftp-macros':
+ source => 'puppet:///modules/apache2/puppet-ftp-macros',
+ }
+
apache2::config { 'puppet-config':
content => template('apache2/puppet-config.erb'),
}
source => 'puppet:///modules/apache2/apache2.logrotate',
}
- file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs' ]:
+ 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',
}
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/.nobackup':
mode => '0644',
content => '',
script => 'ps_',
}
- if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
+ if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':
description => 'Allow web access',
rule => '&SERVICE(tcp, (http https))'
}
+
+ exec { 'service apache2 reload':
+ path => '/usr/bin:/usr/sbin:/bin:/sbin',
+ command => 'service apache2 reload',
+ refreshonly => true,
+ require => Package['apache2'],
+ }
+
+ apache2::config { 'puppet-ssl-key-pins':
+ content => template('apache2/ssl-key-pins.erb'),
+ notify => Exec['service apache2 reload'],
+ }
}