From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 31 Jan 2016 17:45:26 +0000 (+0100)
Subject: ssl for debconf[01]
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=03c1639d31d92fa136c3dca99a1d8043d8b4aad5;p=mirror%2Fdsa-puppet.git

ssl for debconf[01]
---

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 04fc1a37c..66c88dcc8 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -90,4 +90,7 @@ class roles::static_mirror {
 	ssl::service { 'd-i.debian.org':
 		notify => Service['apache2'],
 	}
+
+	ssl::service { 'debconf0.debconf.org': notify => Service['apache2'], key => true, }
+	ssl::service { 'debconf1.debconf.org': notify => Service['apache2'], key => true, }
 }
diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 80f0a989e..8a4ba7e48 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -35,8 +35,8 @@ vhost(lines, "dsa.debian.org"      , "ssl")
 vhost(lines, "rtc.debian.org"      , "ssl")
 
 vhost(lines, "10years.debconf.org")
-vhost(lines, "debconf0.debconf.org")
-vhost(lines, "debconf1.debconf.org")
+vhost(lines, "debconf0.debconf.org", "ssl")
+vhost(lines, "debconf1.debconf.org", "ssl")
 vhost(lines, "debconf2.debconf.org")
 vhost(lines, "debconf3.debconf.org")
 vhost(lines, "debconf4.debconf.org")
@@ -46,6 +46,7 @@ vhost(lines, "debconf7.debconf.org")
 vhost(lines, "es.debconf.org")
 vhost(lines, "fr.debconf.org")
 vhost(lines, "miniconf10.debconf.org")
+
 vhost(lines, "deb.debian.org")
 
 lines.join("\n")