X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=53fdf8334aff03e4eee8a9fb205043d549bbfda1;hb=53787787136a5e947615d5445ad6015074fc2576;hp=38bc685dbd29335c2478f5586876216dcb85cb1c;hpb=fcd178e69f31c2bb35f10b6608b8799a69297f1d;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 38bc685db..53fdf8334 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,7 +33,7 @@ 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.4.15', senfter => '5.153.231.4', @@ -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'), @@ -96,10 +102,13 @@ class roles::static_mirror { 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 } @@ -135,6 +144,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 } @@ -148,6 +158,8 @@ class roles::static_mirror { 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 } @@ -180,4 +192,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, + } + }