X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=f37b81006142d76b634ad890dd89a4a01d24d6b2;hb=683ffc212c9c3a4d7e4a4ff98c94fb52a75a02ca;hp=5c5622efe3c61b1498f1a9a99db1a79199df9b54;hpb=23b3472027a552a8d691d19cdfb60a521f027955;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 5c5622efe..f37b81006 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,14 +1,14 @@
 class roles::static_mirror {
 
 	include roles::static_source
+	include apache2::cache
 
-	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 { 'include': }
+	apache2::module { 'ssl': }
 	apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
 
 	file { '/usr/local/bin/static-mirror-run':
@@ -24,15 +24,19 @@ 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 ? {
 		klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
 		default => '*:80',
 	}
+	$vhost_listen_443 = $::hostname ? {
+		klecker => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443',
+		default => '*:443',
+	}
 
-	apache2::config { "local-static-vhost.conf":
+	apache2::config { 'local-static-vhost.conf':
 		content => template('roles/static-mirroring/static-vhost.conf.erb'),
 	}
 
@@ -42,7 +46,17 @@ 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'),
+	}
+
+	ssl::service { 'dsa.debian.org':
+		notify => Service['apache2'],
+	}
 }