From 9f7c89a4e68c7bfd5f3cafd67d4071f4ab0d2784 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 2 Feb 2016 08:59:53 +0100 Subject: [PATCH] ssl for {news,debaday,timeline}.debian.net, debconf[4567].debconf.org --- modules/roles/manifests/static_mirror.pp | 7 +++++++ .../vhost/static-vhosts-simple.erb | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index fea2e356c..da7b5a50d 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -91,8 +91,15 @@ class roles::static_mirror { notify => Service['apache2'], } + if has_static_component('news.debian.net' ) { ssl::service { 'news.debian.net' : notify => Service['apache2'], key => true, } } + if has_static_component('debaday.debian.net' ) { ssl::service { 'debaday.debian.net' : notify => Service['apache2'], key => true, } } + if has_static_component('timeline.debian.net' ) { ssl::service { 'timeline.debian.net' : 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, } } + if has_static_component('debconf4.debconf.org') { ssl::service { 'debconf4.debconf.org': notify => Service['apache2'], key => true, } } + 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, } } } 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 d19ebb81d..2f38b7e48 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -18,10 +18,10 @@ lines = [] vhost(lines, "mozilla.debian.net") vhost(lines, "backports.debian.org") vhost(lines, "incoming.debian.org") -vhost(lines, "news.debian.net") -vhost(lines, "debaday.debian.net") vhost(lines, "debdeltas.debian.net") -vhost(lines, "timeline.debian.net") +vhost(lines, "news.debian.net" , "ssl") +vhost(lines, "debaday.debian.net" , "ssl") +vhost(lines, "timeline.debian.net" , "ssl") vhost(lines, "network-test.debian.org" , "with-extra", '"ServerAlias network-test-backend.debian.org"') vhost(lines, "blends.debian.org" , "with-extra", '"ServerAlias blends-backend.debian.org"') vhost(lines, "wnpp-by-tags.debian.net" , "with-extra", '"ServerAlias wnpp-by-tags-backend.debian.org"') @@ -36,10 +36,10 @@ vhost(lines, "debconf0.debconf.org", "ssl") vhost(lines, "debconf1.debconf.org", "ssl") 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") -vhost(lines, "debconf7.debconf.org") +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") -- 2.20.1