From: Julien Cristau <jcristau@debian.org>
Date: Tue, 5 Dec 2017 08:20:53 +0000 (+0100)
Subject: Add sources.d.n static vhost with redirect to sources.d.o
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=cc0b6e462d95cdc737e366a526c41ab6ce698568;p=mirror%2Fdsa-puppet.git

Add sources.d.n static vhost with redirect to sources.d.o
---

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 @@
 	</FilesMatch>
 </Macro>
 
+<Macro vstatic-vhost-extra-sources.debian.net>
+	Redirect permanent / https://sources.debian.org/
+</Macro>
+
 <%=
 
 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)