class roles::static_mirror {
-
- include roles::static_source
+ include roles::static_base
+ include roles::static_srvdir
include apache2::expires
include apache2::rewrite
mode => '0555',
}
- file { '/srv/static.debian.org':
- ensure => directory,
- owner => staticsync,
- group => staticsync,
- mode => '02755'
- }
-
- file { '/etc/cron.d/puppet-static-mirror':
- content => "MAILTO=root\nPATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; chronic static-mirror-run-all\n",
+ file { '/etc/cron.d/puppet-static-mirror': ensure => absent, }
+ concat::fragment { 'dsa-puppet-stuff--static-mirror':
+ target => '/etc/cron.d/dsa-puppet-stuff',
+ content => @(EOF)
+ @reboot staticsync sleep 60; chronic static-mirror-run-all
+ | EOF
}
$onion_v4_addr = $::hostname ? {
default => undef,
}
$vhost_listen = $::hostname ? {
- klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
+ klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80 [2001:67c:2564:a119::148:14]:80',
mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
mirror-anu => '150.203.164.62:80 [2001:388:1034:2900::3e]:80',
default => '*:80',
}
$vhost_listen_443 = $::hostname ? {
- klecker => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443',
+ klecker => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443 [2001:67c:2564:a119::148:14]:443',
mirror-isc => '149.20.4.15:443 [2001:4f8:1:c::15]:443',
mirror-anu => '150.203.164.62:443 [2001:388:1034:2900::3e]:443',
default => '*:443',
ssl::service { 'manpages.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'mirror-master.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'onion.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
+ ssl::service { 'planet-backend.debian.org' :
+ ensure => has_static_component('planet.debian.org') ? { true => "present", false => "absent" },
+ notify => Exec['service apache2 reload'],
+ key => true,
+ }
ssl::service { 'release.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'rtc.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true }
ssl::service { 'security-team.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'micronews.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'mozilla.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'news.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
+ ssl::service { 'sources.debian.net' : ensure => "present", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'timeline.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
+ ssl::service { 'video.debian.net' : ensure => "present", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'wnpp-by-tags.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
# dc
ssl::service { '10years.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'debconf0.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'debconf1.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'debconf16.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
+ ssl::service { 'debconf17.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
+ ssl::service { 'debconf18.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'debconf2.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'debconf3.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'debconf4.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
onion::service { 'debconf0.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'debconf1.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'debconf16.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
+ onion::service { 'debconf17.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
+ onion::service { 'debconf18.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'debconf2.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'debconf3.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'debconf4.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'planet.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
}
- ssl::service { 'archive.debian.net': ensure => present, notify => Exec['service apache2 reload'], key => true, }
file { '/srv/static.debian.org/puppet':
ensure => directory,
mode => '02755'
}
- file { '/srv/static.debian.org/puppet/archive.debian.net':
+ file { '/srv/static.debian.org/puppet/disabled-service':
ensure => directory,
mode => '02755'
}
+ file { '/srv/static.debian.org/puppet/disabled-service/503.html':
+ source => 'puppet:///modules/roles/static-htdocs/disabled-service/503.html',
+ }
+
+ ssl::service { 'archive.debian.net': ensure => present, notify => Exec['service apache2 reload'], key => true, }
+ file { '/srv/static.debian.org/puppet/archive.debian.net':
+ ensure => absent,
+ }
file { '/srv/static.debian.org/puppet/archive.debian.net/503.html':
- source => 'puppet:///modules/roles/static-htdocs/archive.debian.net/503.html',
+ ensure => absent,
}
}