X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=fca65b443dbbf2b26adb10b0174234aac00478da;hb=1517f5e59bda6b8e85df9efad0a52f91afec5e68;hp=7d0cfb32c3be31f0e0df15b01aa0305925a5f9a2;hpb=843603a55c2c23ca533da697e1fc1e53ecd76f84;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 7d0cfb32c..fca65b443 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -3,12 +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':
@@ -31,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'),
@@ -51,4 +55,11 @@ class roles::static_mirror {
 		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'],
+	}
 }