X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=7d0cfb32c3be31f0e0df15b01aa0305925a5f9a2;hb=4b4d1fb6ea2b229c2fd454bbc01e295a9ee52705;hp=cc9b2106668ccde1a9d623fa8640960f392a6bf2;hpb=f9367a72e7c03c652700668e10c7314ee1bd4124;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index cc9b21066..7d0cfb32c 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,14 +1,15 @@
 class roles::static_mirror {
 
 	include roles::static_source
+	include apache2::cache
 
-	package { 'libapache2-mod-macro':
-		ensure => installed,
-	}
+	package { 'libapache2-mod-macro': ensure => installed, }
+	package { 'libapache2-mod-geoip': ensure => installed, }
+	package { 'geoip-database': ensure => installed, }
 
 	apache2::module { 'macro': require => Package['libapache2-mod-macro']; }
 	apache2::module { 'rewrite': }
-	apache2::module { 'expires': }
+	apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
 
 	file { '/usr/local/bin/static-mirror-run':
 		source => 'puppet:///modules/roles/static-mirroring/static-mirror-run',
@@ -23,7 +24,7 @@ class roles::static_mirror {
 	}
 
 	file { '/etc/cron.d/puppet-static-mirror':
-			content => "PATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; static-mirror-run --one-stage /srv/static.debian.org bizet.debian.org:-live- > /dev/null\n",
+			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",
 	}
 
 	$vhost_listen = $::hostname ? {
@@ -31,7 +32,7 @@ class roles::static_mirror {
 		default => '*:80',
 	}
 
-	apache2::config { "local-static-vhost.conf":
+	apache2::config { 'local-static-vhost.conf':
 		content => template('roles/static-mirroring/static-vhost.conf.erb'),
 	}
 
@@ -40,8 +41,14 @@ class roles::static_mirror {
 		content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
 	}
 
-	apache2::site { '10-static-vhosts-simple':
-		site => "static-vhosts-simple",
+	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':
+		site   => 'www.debian.org',
+		content => template('roles/apache-www.debian.org.erb'),
+	}
 }