From cc0b6e462d95cdc737e366a526c41ab6ce698568 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 5 Dec 2017 09:20:53 +0100 Subject: [PATCH] Add sources.d.n static vhost with redirect to sources.d.o --- modules/roles/manifests/static_mirror.pp | 1 + .../static-mirroring/vhost/static-vhosts-simple.erb | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index f7cefc614..e7050fcfb 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -119,6 +119,7 @@ class roles::static_mirror { ssl::service { 'micronews.debian.org' : 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 { 'news.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } + ssl::service { 'sources.debian.net' : ensure => "present", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'timeline.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'video.debian.net' : ensure => "present", notify => Exec['service apache2 reload'], key => true, } ssl::service { 'wnpp-by-tags.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], 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 146124af8..30a186eaa 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -158,6 +158,10 @@ + + Redirect permanent / https://sources.debian.org/ + + <%= def vhost(lines, sn, kwargs={}) @@ -191,6 +195,7 @@ end lines = [] vhost(lines, "mozilla.debian.net" , :ssl => true, :ssl_optional => true) +vhost(lines, "sources.debian.net" , :ssl => true, :extra => true) vhost(lines, "backports.debian.org" , :ssl => true) vhost(lines, "incoming.debian.org" , :ssl => true, :ssl_optional => true) vhost(lines, "incoming.ports.debian.org" , :ssl => true, :ssl_optional => true) -- 2.20.1