From 3fa4c08d9e2ac03daa4eef2f51a11b9f3dbb9546 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 31 Jan 2016 17:58:06 +0000 Subject: [PATCH] ssl for debconf[23] --- modules/roles/manifests/static_mirror.pp | 6 ++++-- .../static-mirroring/vhost/static-vhosts-simple.erb | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 66c88dcc8..9faab44bf 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -91,6 +91,8 @@ class roles::static_mirror { notify => Service['apache2'], } - ssl::service { 'debconf0.debconf.org': notify => Service['apache2'], key => true, } - ssl::service { 'debconf1.debconf.org': notify => Service['apache2'], key => true, } + if has_static_component('debconf0.debconf.org') { ssl::service { 'debconf0.debconf.org': notify => Service['apache2'], key => true, } } + if has_static_component('debconf1.debconf.org') { ssl::service { 'debconf1.debconf.org': notify => Service['apache2'], key => true, } } + if has_static_component('debconf2.debconf.org') { ssl::service { 'debconf2.debconf.org': notify => Service['apache2'], key => true, } } + if has_static_component('debconf3.debconf.org') { ssl::service { 'debconf3.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 0cb65ad13..d19ebb81d 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -34,8 +34,8 @@ vhost(lines, "rtc.debian.org" , "ssl") vhost(lines, "10years.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, "debconf2.debconf.org", "ssl") +vhost(lines, "debconf3.debconf.org", "ssl") vhost(lines, "debconf4.debconf.org") vhost(lines, "debconf5.debconf.org") vhost(lines, "debconf6.debconf.org") -- 2.20.1