X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=1a754f9accc8bb8c111ce87fac3cd679b76be39f;hb=155efbd68fa7f26852f430cbe6a50528c45c820e;hp=e86899c17ffb69db7cd838ca698752fa1380cc24;hpb=63c37fed460bfbd6690459f36c123b6d4d8adc1a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index e86899c17..1a754f9ac 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,6 +1,6 @@
 class roles::static_mirror {
-
-	include roles::static_source
+	include roles::static_base
+	include roles::static_srvdir
 	include apache2::expires
 	include apache2::rewrite
 
@@ -21,13 +21,6 @@ class roles::static_mirror {
 		mode   => '0555',
 	}
 
-	file { '/srv/static.debian.org':
-		ensure => directory,
-		owner  => staticsync,
-		group  => staticsync,
-		mode   => '02755'
-	}
-
 	file { '/etc/cron.d/puppet-static-mirror':
 			content => "MAILTO=root\nPATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; chronic static-mirror-run-all\n",
 	}
@@ -40,13 +33,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,12 +115,15 @@ 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, }
 	ssl::service { 'debconf0.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'debconf1.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	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 { '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, }
@@ -178,6 +174,8 @@ class roles::static_mirror {
 		onion::service { 'debconf0.debconf.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'debconf1.debconf.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'debconf16.debconf.org'         : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
+		onion::service { 'debconf17.debconf.org'         : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
+		onion::service { 'debconf18.debconf.org'         : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'debconf2.debconf.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'debconf3.debconf.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
 		onion::service { 'debconf4.debconf.org'          : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
@@ -197,12 +195,20 @@ class roles::static_mirror {
 		ensure => directory,
 		mode   => '02755'
 	}
-	file { '/srv/static.debian.org/puppet/archive.debian.net':
+	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':
-		source => 'puppet:///modules/roles/static-htdocs/archive.debian.net/503.html',
+		ensure => absent,
 	}
 
 }