X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=7d0cfb32c3be31f0e0df15b01aa0305925a5f9a2;hb=53d4eeef534be151a7194e0a43b75879e205a01f;hp=c8d9335aa6c02116fe5ca7a984fb43150a7996d7;hpb=b762782a06b2fff4d656866def1c5267835be269;p=dsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index c8d9335a..7d0cfb32 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,6 +1,7 @@
 class roles::static_mirror {
 
 	include roles::static_source
+	include apache2::cache
 
 	package { 'libapache2-mod-macro': ensure => installed, }
 	package { 'libapache2-mod-geoip': ensure => installed, }
@@ -8,7 +9,6 @@ class roles::static_mirror {
 
 	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':
@@ -24,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; for a in `awk '!/^ *(#|$)/ {printf "%s:%s/-live-\n", $1, $2}' /etc/static-components.conf`; do static-mirror-run --one-stage /srv/static.debian.org "$a" > /dev/null; done\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 ? {
@@ -32,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'),
 	}
 
@@ -42,7 +42,13 @@ class roles::static_mirror {
 	}
 
 	apache2::site { '010-static-vhosts-simple':
-		site => "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'),
+	}
 }