X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=26ffa34bba4c1fdef669bf43a5202104f6d18624;hb=e61fd58dc36fa5a465f75d21b399034ef4869053;hp=f37b81006142d76b634ad890dd89a4a01d24d6b2;hpb=52ab75241aa59786d9cf7af14dc99c8ee1641483;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index f37b81006..26ffa34bb 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']]; }
@@ -45,13 +44,18 @@ 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'),
 	}
@@ -59,4 +63,10 @@ class roles::static_mirror {
 	ssl::service { 'dsa.debian.org':
 		notify => Service['apache2'],
 	}
+	ssl::service { 'www.debian.org':
+		notify => Service['apache2'],
+	}
+	ssl::service { 'rtc.debian.org':
+		notify => Service['apache2'],
+	}
 }