X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=ef4161dcd95af41aa3f5cdca06c1572f5bd08078;hb=238fdd5e5d0d4b23f53464147b2270073d961701;hp=784d53baf8eb4e59dfd9357b81ac86227d546982;hpb=fbe0da36ab4e9e1c76f0b4cff52d3d8ce3fc5d43;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 784d53baf..ef4161dcd 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 apache2::expires + include apache2::rewrite package { 'libapache2-mod-geoip': ensure => installed, } package { 'geoip-database': ensure => installed, } @@ -32,21 +33,21 @@ class roles::static_mirror { } $onion_v4_addr = $::hostname ? { - busoni => '140.211.15.34', + busoni => '140.211.166.202', klecker => '130.89.148.14', - mirror-isc => '149.20.20.22', + 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', - mirror-isc => '149.20.20.22:80 [2001:4f8:8:36::1deb:22]: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', - mirror-isc => '149.20.20.22:443 [2001:4f8:8:36::1deb:22]: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', } @@ -69,6 +70,11 @@ class roles::static_mirror { ensure => absent, } + apache2::site { '010-static-vhosts-00-manpages': + site => 'static-manpages.debian.org', + ensure => has_static_component('manpages.debian.org') ? { true => "present", false => "absent" }, + content => template('roles/static-mirroring/vhost/manpages.debian.org.erb'), + } apache2::site { '010-static-vhosts-simple': site => 'static-vhosts-simple', content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'), @@ -81,18 +87,28 @@ class roles::static_mirror { content => template('roles/apache-www.debian.org.erb'), } - ssl::service { 'www.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], } + ssl::service { 'www.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'debian.org' : + ensure => has_static_component('www.debian.org') ? { true => "present", false => "absent" }, + notify => Exec['service apache2 reload'], + key => true, + } # do ssl::service { 'appstream.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'apt.buildd.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } 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 { '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 { '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 { '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 } @@ -128,18 +144,22 @@ 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 } # do onion::service { 'appstream.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'apt.buildd.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } 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 { '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 { '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 }