X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=5dcb326360e77a0b8ac4fff8c0f686ee3c185bf2;hb=e3bebd85cddff77d74c2015315f1baf2d2977ed2;hp=ef4161dcd95af41aa3f5cdca06c1572f5bd08078;hpb=23d40196162f1990711e274fcf45371916877c57;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index ef4161dcd..5dcb32636 100644
--- 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',
@@ -122,6 +122,7 @@ class roles::static_mirror {
 	ssl::service { 'mozilla.debian.net'            : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'news.debian.net'               : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'timeline.debian.net'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'video.debian.net'              : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'wnpp-by-tags.debian.net'       : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	# dc
 	ssl::service { '10years.debconf.org'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
@@ -192,4 +193,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,
+	}
+
 }