X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=4b042eb7b948615d34cf7c178fb6eb62b6e7c0ee;hb=372685900fc51ce956bddc100bc534327946bb10;hp=9faab44bfe080de681c2a5265e6593bdd94efb67;hpb=3fa4c08d9e2ac03daa4eef2f51a11b9f3dbb9546;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 9faab44bf..4b042eb7b 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -6,8 +6,8 @@ class roles::static_mirror { package { 'libapache2-mod-geoip': ensure => installed, } package { 'geoip-database': ensure => installed, } + include apache2::ssl apache2::module { 'include': } - apache2::module { 'ssl': } apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; } file { '/usr/local/bin/static-mirror-run': @@ -31,15 +31,22 @@ class roles::static_mirror { content => "MAILTO=root\nPATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; chronic static-mirror-run-all\n", } + $onion_v4_addr = $::hostname ? { + busoni => '140.211.15.34', + klecker => '130.89.148.14', + mirror-isc => '149.20.20.22', + 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.20:80 [2001:4f8:8:36::1deb:20]:80', + mirror-isc => '149.20.20.22:80 [2001:4f8:8:36::1deb:22]: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.20:443 [2001:4f8:8:36::1deb:20]:443', + mirror-isc => '149.20.20.22:443 [2001:4f8:8:36::1deb:22]:443', mirror-anu => '150.203.164.62:443 [2001:388:1034:2900::3e]:443', default => '*:443', } @@ -50,11 +57,13 @@ class roles::static_mirror { apache2::site { '010-planet.debian.org': site => 'planet.debian.org', + ensure => has_static_component('planet.debian.org') ? { true => "present", false => "absent" }, content => template('roles/static-mirroring/vhost/planet.debian.org.erb'), } apache2::site { '010-lintian.debian.org': site => 'lintian.debian.org', + ensure => has_static_component('lintian.debian.org') ? { true => "present", false => "absent" }, content => template('roles/static-mirroring/vhost/lintian.debian.org.erb'), } @@ -66,33 +75,89 @@ class roles::static_mirror { $wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur' apache2::site { '005-www.debian.org': site => 'www.debian.org', + ensure => has_static_component('www.debian.org') ? { true => "present", false => "absent" }, content => template('roles/apache-www.debian.org.erb'), } - ssl::service { 'dsa.debian.org': - notify => Service['apache2'], - } - ssl::service { 'www.debian.org': - notify => Service['apache2'], - } - ssl::service { 'bits.debian.org': - notify => Service['apache2'], - } - ssl::service { 'lintian.debian.org': - notify => Service['apache2'], - } - ssl::service { 'rtc.debian.org': - notify => Service['apache2'], - } - ssl::service { 'appstream.debian.org': - notify => Service['apache2'], - } - ssl::service { 'd-i.debian.org': - notify => Service['apache2'], - } + ssl::service { 'dsa.debian.org' : ensure => "ifstatic", notify => Service['apache2'], } + ssl::service { 'www.debian.org' : ensure => "ifstatic", notify => Service['apache2'], } + ssl::service { 'rtc.debian.org' : ensure => "ifstatic", notify => Service['apache2'], } + ssl::service { 'd-i.debian.org' : ensure => "ifstatic", notify => Service['apache2'], } + + # do + ssl::service { 'appstream.debian.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'backports.debian.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'bits.debian.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'blends.debian.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'lintian.debian.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'onion.debian.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'release.debian.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'security-team.debian.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'www.ports.debian.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + # dn + ssl::service { 'news.debian.net' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'debaday.debian.net' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'timeline.debian.net' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'wnpp-by-tags.debian.net' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + # dc + ssl::service { 'debconf0.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'debconf1.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'debconf2.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'debconf3.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'debconf4.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'debconf5.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'debconf6.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'debconf7.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { '10years.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'es.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'fr.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + ssl::service { 'miniconf10.debconf.org' : ensure => "ifstatic", notify => Service['apache2'], key => true, } + + if has_role('static_mirror_onion') { + if ! $onion_v4_addr { + fail("Do not have an onion_v4_addr set for $::hostname.") + } - if has_static_component('debconf0.debconf.org') { ssl::service { 'debconf0.debconf.org': notify => Service['apache2'], key => true, } } - if has_static_component('debconf1.debconf.org') { ssl::service { 'debconf1.debconf.org': notify => Service['apache2'], key => true, } } - if has_static_component('debconf2.debconf.org') { ssl::service { 'debconf2.debconf.org': notify => Service['apache2'], key => true, } } - if has_static_component('debconf3.debconf.org') { ssl::service { 'debconf3.debconf.org': notify => Service['apache2'], key => true, } } + onion::service { 'dsa.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 } + onion::service { 'rtc.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'd-i.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 { '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 { 'lintian.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 } + onion::service { 'www.ports.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + # dn + onion::service { 'news.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'debaday.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'timeline.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'wnpp-by-tags.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + # dc + 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 { '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 { 'debconf5.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'debconf6.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'debconf7.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { '10years.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'es.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'fr.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'miniconf10.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + + # non-SSL + onion::service { 'debdeltas.debian.net' : 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 { 'metadata.ftp-master.debian.org': ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'mozilla.debian.net' : 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 } + } }