X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=aa3e69c433194e4275abcc874e26eca4d66659c7;hb=47e9ce49040948746aa82436b8b8646a741d366e;hp=9c4b93b007dd1d4b66ad93886fa06fdbf771237b;hpb=d4f4eb6059a32e6eba1fbf08de7a5d65a562db8a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 9c4b93b00..aa3e69c43 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -3,13 +3,12 @@ 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 { 'include': }
+	apache2::module { 'ssl': }
 	apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
 
 	file { '/usr/local/bin/static-mirror-run':
@@ -32,6 +31,10 @@ class roles::static_mirror {
 		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':
 		content => template('roles/static-mirroring/static-vhost.conf.erb'),
@@ -48,8 +51,18 @@ class roles::static_mirror {
 	}
 
 	$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'),
 	}
+
+	ssl::service { 'dsa.debian.org':
+		notify => Service['apache2'],
+	}
+	ssl::service { 'www.debian.org':
+		notify => Service['apache2'],
+	}
+	ssl::service { 'rtc.debian.org':
+		notify => Service['apache2'],
+	}
 }