From f877b77ec895d730b803ebb6d9ddeb58df62bc79 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 2 Feb 2016 18:34:23 +0100 Subject: [PATCH] ssl for {10years,es,fr,miniconf10}.debconf.org --- modules/roles/manifests/static_mirror.pp | 4 ++++ .../static-mirroring/vhost/static-vhosts-simple.erb | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index da7b5a50d..ef54d3414 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -102,4 +102,8 @@ class roles::static_mirror { if has_static_component('debconf5.debconf.org') { ssl::service { 'debconf5.debconf.org': notify => Service['apache2'], key => true, } } if has_static_component('debconf6.debconf.org') { ssl::service { 'debconf6.debconf.org': notify => Service['apache2'], key => true, } } if has_static_component('debconf7.debconf.org') { ssl::service { 'debconf7.debconf.org': notify => Service['apache2'], key => true, } } + if has_static_component('10years.debconf.org' ) { ssl::service { '10years.debconf.org' : notify => Service['apache2'], key => true, } } + if has_static_component('es.debconf.org' ) { ssl::service { 'es.debconf.org' : notify => Service['apache2'], key => true, } } + if has_static_component('fr.debconf.org' ) { ssl::service { 'fr.debconf.org' : notify => Service['apache2'], key => true, } } + if has_static_component('miniconf10.debconf.org') { ssl::service { 'miniconf10.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 2f38b7e48..4ba311495 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -31,7 +31,7 @@ vhost(lines, "appstream.debian.org", "ssl") vhost(lines, "dsa.debian.org" , "ssl") vhost(lines, "rtc.debian.org" , "ssl") -vhost(lines, "10years.debconf.org") +vhost(lines, "10years.debconf.org" , "ssl") vhost(lines, "debconf0.debconf.org", "ssl") vhost(lines, "debconf1.debconf.org", "ssl") vhost(lines, "debconf2.debconf.org", "ssl") @@ -40,9 +40,9 @@ vhost(lines, "debconf4.debconf.org", "ssl") vhost(lines, "debconf5.debconf.org", "ssl") vhost(lines, "debconf6.debconf.org", "ssl") vhost(lines, "debconf7.debconf.org", "ssl") -vhost(lines, "es.debconf.org") -vhost(lines, "fr.debconf.org") -vhost(lines, "miniconf10.debconf.org") +vhost(lines, "es.debconf.org" , "ssl") +vhost(lines, "fr.debconf.org" , "ssl") +vhost(lines, "miniconf10.debconf.org" , "ssl") vhost(lines, "deb.debian.org") -- 2.20.1