From 81b77c4f373a1eb5059c92c7711f93456ef50aec Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 27 Aug 2016 18:36:13 +0200 Subject: [PATCH] ssl for mozilla.debian.net --- modules/roles/manifests/static_mirror.pp | 3 ++- .../templates/static-mirroring/vhost/static-vhosts-simple.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 7eadb9f8b..50451ddfa 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -96,6 +96,7 @@ class roles::static_mirror { # dn ssl::service { 'news.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'micronews.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'mozilla.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'debaday.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'timeline.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'wnpp-by-tags.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } @@ -137,6 +138,7 @@ class roles::static_mirror { # dn onion::service { 'news.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'micronews.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } + onion::service { 'mozilla.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'debaday.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'timeline.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'wnpp-by-tags.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } @@ -160,7 +162,6 @@ class roles::static_mirror { onion::service { 'incoming.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'incoming.ports.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'metadata.ftp-master.debian.org': ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } - onion::service { 'mozilla.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } onion::service { 'planet.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr } } } 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 0ed840921..ff11890f8 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -137,7 +137,7 @@ def vhost(lines, sn, kwargs={}) end lines = [] -vhost(lines, "mozilla.debian.net") +vhost(lines, "mozilla.debian.net" , :ssl => true, :ssl_optional => true) vhost(lines, "backports.debian.org" , :ssl => true) vhost(lines, "incoming.debian.org") vhost(lines, "incoming.ports.debian.org") -- 2.20.1