new rsync option from stretch rsync clients

[mirror/dsa-puppet.git] / modules / roles / manifests / static_mirror.pp

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 810c9c2..2b0d6e1 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -40,13 +40,13 @@ class roles::static_mirror {
                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',
@@ -102,6 +102,7 @@ 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, }
@@ -143,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 }
@@ -190,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,
+       }
+
 }