X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=cb653d0e037e0acce175a9b4cda3ac02d8279e6b;hb=eedd9b7a5e400500547a9e40bb9bd2e415dfb701;hp=2dfc3336c09b2741f8e0b3742eaa02bf48d61970;hpb=a8004e61dd75597295a5ff1b2e2ec5cda01538bf;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 2dfc3336c..cb653d0e0 100644 --- 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', @@ -235,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', + } }