X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=575ac41a04fa324220820306c4930e2ebad893db;hb=500e92545de52baefc1d2bcb98e4207135c292dc;hp=32de1c12d97f2371f96496a66ee5248404a28fff;hpb=c88585d0d7dbcf2f0b121d2d967b15d8c16c1c65;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 32de1c12d..575ac41a0 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -6,8 +6,8 @@ class roles::static_mirror {
 	package { 'libapache2-mod-geoip': ensure => installed, }
 	package { 'geoip-database': ensure => installed, }
 
+	include apache2::ssl
 	apache2::module { 'include': }
-	apache2::module { 'ssl': }
 	apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
 
 	file { '/usr/local/bin/static-mirror-run':
@@ -34,11 +34,13 @@ class roles::static_mirror {
 	$vhost_listen = $::hostname ? {
 		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
 		mirror-isc => '149.20.20.20:80 [2001:4f8:8:36::1deb:20]: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',
 		mirror-isc => '149.20.20.20:443 [2001:4f8:8:36::1deb:20]:443',
+		mirror-anu => '150.203.164.62:443 [2001:388:1034:2900::3e]:443',
 		default    => '*:443',
 	}
 
@@ -48,11 +50,13 @@ class roles::static_mirror {
 
 	apache2::site { '010-planet.debian.org':
 		site    => 'planet.debian.org',
+		ensure  => has_static_component('planet.debian.org') ? { true => "present", false => "absent" },
 		content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
 	}
 
 	apache2::site { '010-lintian.debian.org':
 		site    => 'lintian.debian.org',
+		ensure  => has_static_component('lintian.debian.org') ? { true => "present", false => "absent" },
 		content => template('roles/static-mirroring/vhost/lintian.debian.org.erb'),
 	}
 
@@ -64,25 +68,31 @@ class roles::static_mirror {
 	$wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
 	apache2::site { '005-www.debian.org':
 		site   => 'www.debian.org',
+		ensure  => has_static_component('www.debian.org') ? { true => "present", false => "absent" },
 		content => template('roles/apache-www.debian.org.erb'),
 	}
 
-	ssl::service { 'dsa.debian.org':
-		notify => Service['apache2'],
-	}
-	ssl::service { 'www.debian.org':
-		notify => Service['apache2'],
-	}
-	ssl::service { 'bits.debian.org':
-		notify => Service['apache2'],
-	}
-	ssl::service { 'lintian.debian.org':
-		notify => Service['apache2'],
-	}
-	ssl::service { 'rtc.debian.org':
-		notify => Service['apache2'],
-	}
-	ssl::service { 'appstream.debian.org':
-		notify => Service['apache2'],
-	}
+	ssl::service { 'dsa.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
+	ssl::service { 'www.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
+	ssl::service { 'bits.debian.org'     : ensure => "ifstatic", notify => Service['apache2'], }
+	ssl::service { 'lintian.debian.org'  : ensure => "ifstatic", notify => Service['apache2'], }
+	ssl::service { 'rtc.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
+	ssl::service { 'appstream.debian.org': ensure => "ifstatic", notify => Service['apache2'], }
+	ssl::service { 'd-i.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
+
+	ssl::service { 'news.debian.net'       : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'debaday.debian.net'    : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'timeline.debian.net'   : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'debconf0.debconf.org'  : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'debconf1.debconf.org'  : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'debconf2.debconf.org'  : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'debconf3.debconf.org'  : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'debconf4.debconf.org'  : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'debconf5.debconf.org'  : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'debconf6.debconf.org'  : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'debconf7.debconf.org'  : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { '10years.debconf.org'   : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'es.debconf.org'        : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'fr.debconf.org'        : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'miniconf10.debconf.org': ensure => "ifstatic", notify => Service['apache2'], key => true, }
 }