X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=66c88dcc8e4066f866f8204c0b8cdbc67416b7f1;hb=03c1639d31d92fa136c3dca99a1d8043d8b4aad5;hp=cdaa9afbcbf71b2dd2c5441fdc733d18eee2ea34;hpb=35590b272f1aec5a4bc48c40fe8a763b3556f411;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index cdaa9afbc..66c88dcc8 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, }
 
-	apache2::module { 'rewrite': }
 	apache2::module { 'include': }
+	apache2::module { 'ssl': }
 	apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
 
 	file { '/usr/local/bin/static-mirror-run':
@@ -15,6 +15,11 @@ class roles::static_mirror {
 		mode   => '0555',
 	}
 
+	file { '/usr/local/bin/static-mirror-run-all':
+		source => 'puppet:///modules/roles/static-mirroring/static-mirror-run-all',
+		mode   => '0555',
+	}
+
 	file { '/srv/static.debian.org':
 		ensure => directory,
 		owner  => staticsync,
@@ -23,12 +28,20 @@ class roles::static_mirror {
 	}
 
 	file { '/etc/cron.d/puppet-static-mirror':
-			content => "PATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; awk '!/^ *(#|$)/ {print \$1, \$2}' /etc/static-components.conf | while read master component; do static-mirror-run --one-stage /srv/static.debian.org/mirrors/\$component \"\$master:\$component/-live-\" > /dev/null; done\n",
+			content => "MAILTO=root\nPATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; chronic static-mirror-run-all\n",
 	}
 
 	$vhost_listen = $::hostname ? {
-		klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
-		default => '*:80',
+		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',
 	}
 
 	apache2::config { 'local-static-vhost.conf':
@@ -40,14 +53,44 @@ class roles::static_mirror {
 		content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
 	}
 
+	apache2::site { '010-lintian.debian.org':
+		site    => 'lintian.debian.org',
+		content => template('roles/static-mirroring/vhost/lintian.debian.org.erb'),
+	}
+
 	apache2::site { '010-static-vhosts-simple':
 		site => 'static-vhosts-simple',
 		content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
 	}
 
 	$wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
-	apache2::site { '010-www.debian.org':
+	apache2::site { '005-www.debian.org':
 		site   => 'www.debian.org',
 		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 { 'd-i.debian.org':
+		notify => Service['apache2'],
+	}
+
+	ssl::service { 'debconf0.debconf.org': notify => Service['apache2'], key => true, }
+	ssl::service { 'debconf1.debconf.org': notify => Service['apache2'], key => true, }
 }