X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=902a9b99b86807e3606f85613d8cafbbf05fbd21;hb=6a59b7f5b40a60504425a237d404837345aa358b;hp=aa3e69c433194e4275abcc874e26eca4d66659c7;hpb=97a742d967dfccc4b492e9591d85391cf9e2e979;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index aa3e69c43..902a9b99b 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -6,7 +6,6 @@ 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']]; }
@@ -16,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,
@@ -24,16 +28,18 @@ 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',
+		default    => '*:80',
 	}
 	$vhost_listen_443 = $::hostname ? {
-		klecker => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443',
-		default => '*:443',
+		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',
+		default    => '*:443',
 	}
 
 	apache2::config { 'local-static-vhost.conf':
@@ -45,6 +51,11 @@ 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'),
@@ -62,7 +73,19 @@ class roles::static_mirror {
 	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'],
+	}
 }