X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=cb653d0e037e0acce175a9b4cda3ac02d8279e6b;hb=a74b52357ea7cd46947ea6f31d09bf550c2debe2;hp=4bd30e3b0392702f79232240e7c3d221be1ed3a3;hpb=cf8d5329b22f25ab3c45f856742010b90ba0d061;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 4bd30e3b0..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', @@ -236,6 +236,9 @@ class roles::static_mirror { } 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', }