X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=c150637637d11c3c850a95d10324a07217fde03e;hb=e9c182207bf901dd7689986fc02e5c4e24c4553a;hp=0470ac986b972df78494397224b6cf586c9f3c1c;hpb=ea2ab6751bd3887bb9d47a1ff84d53e6912de2b0;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 0470ac986..c15063763 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -1,7 +1,8 @@ class roles::static_mirror { - - include roles::static_source - include apache2::cache + include roles::static_base + include roles::static_srvdir + include apache2::expires + include apache2::rewrite package { 'libapache2-mod-geoip': ensure => installed, } package { 'geoip-database': ensure => installed, } @@ -9,6 +10,8 @@ class roles::static_mirror { include apache2::ssl apache2::module { 'include': } apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; } + apache2::module { 'deflate': } + apache2::module { 'filter': } file { '/usr/local/bin/static-mirror-run': source => 'puppet:///modules/roles/static-mirroring/static-mirror-run', @@ -20,32 +23,28 @@ class roles::static_mirror { 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 ? { - busoni => '140.211.15.34', klecker => '130.89.148.14', mirror-isc => '149.20.4.15', senfter => '5.153.231.4', 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', @@ -79,6 +78,7 @@ class roles::static_mirror { content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'), } + $wwwdo_server_name = 'www.debian.org' $wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur' apache2::site { '005-www.debian.org': site => 'www.debian.org', @@ -99,14 +99,24 @@ class roles::static_mirror { ssl::service { 'backports.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'bits.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'blends.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'cdbuilder-logs.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true } ssl::service { 'd-i.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true } ssl::service { 'deb.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true } + ssl::service { 'dpl.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true } ssl::service { 'dsa.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true } ssl::service { 'incoming.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'incoming.ports.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'lintian.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'lists.alioth.debian.org' : ensure => "present", notify => Exec['service apache2 reload'], key => true, } 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 { 'pkg-ruby-extras.alioth.debian.org' : ensure => "present", 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, } @@ -118,13 +128,17 @@ class roles::static_mirror { 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, } @@ -134,6 +148,7 @@ class roles::static_mirror { ssl::service { 'es.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'fr.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'miniconf10.debconf.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'video.debconf.org' : ensure => "present", notify => Exec['service apache2 reload'], key => true, } if has_role('static_mirror_onion') { if ! $onion_v4_addr { @@ -141,6 +156,7 @@ class roles::static_mirror { } onion::service { 'd-i.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'dpl.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'dsa.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'rtc.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'www.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } @@ -151,10 +167,12 @@ class roles::static_mirror { onion::service { 'backports.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'bits.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'blends.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'cdbuilder-logs.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'incoming.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'incoming.ports.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } - onion::service { 'manpages.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'lintian.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'manpages.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'mirror-master.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'onion.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'release.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'security-team.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } @@ -173,6 +191,8 @@ class roles::static_mirror { 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 } @@ -187,4 +207,25 @@ class roles::static_mirror { onion::service { 'metadata.ftp-master.debian.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 } } + + file { '/srv/static.debian.org/puppet': + ensure => directory, + mode => '02755' + } + 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': + ensure => absent, + } + }