ferm cleanup: bmdb1:dedup

[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 4ecb862..cb653d0 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -38,13 +38,13 @@ class roles::static_mirror {
                default    => undef,
        }
        $vhost_listen = $::hostname ? {
-               klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80 [2001:67c:2564:a119::148:14]:80',
+               klecker    => '130.89.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 [2001:67c:2564:a119::148:14]:443',
+               klecker    => '130.89.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',
@@ -145,6 +145,7 @@ class roles::static_mirror {
        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 { 'debconf19.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, }
@@ -234,4 +235,11 @@ class roles::static_mirror {
                ensure => absent,
        }
 
+       ssl::service { 'cdimage.debian.org': ensure => present, notify => Exec['service apache2 reload'], key => true, }
+       file { '/srv/static.debian.org/puppet/cdimage.debian.org':
+               ensure => directory,
+       }
+       file { '/srv/static.debian.org/puppet/cdimage.debian.org/503.html':
+               source => 'puppet:///modules/roles/static-htdocs/cdimage-maintenance.html',
+       }
 }