From: Julien Cristau <jcristau@debian.org>
Date: Sat, 14 Apr 2018 09:16:22 +0000 (+0200)
Subject: pkg-ruby-extras.alioth.d.o on static
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=870ac16186b79950a020dedc83e5f61eca1ccad3;p=mirror%2Fdsa-puppet.git

pkg-ruby-extras.alioth.d.o on static
---

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index d9463666d..537c79d9e 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -110,6 +110,7 @@ class roles::static_mirror {
 	ssl::service { 'manpages.debian.org'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'mirror-master.debian.org'      : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'onion.debian.org'              : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'pkg-ruby-extras.alioth.debian.org' : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'planet-backend.debian.org'     :
 		ensure => has_static_component('planet.debian.org') ? { true => "present", false => "absent" },
 		notify => Exec['service apache2 reload'],
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 13c6626e4..2708282bc 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -307,6 +307,15 @@ Use common-dsa-vhost-https-redirect lists.alioth.debian.org
 	Redirect / https://alioth-lists.debian.net/
 </VirtualHost>
 
+Use common-dsa-vhost-https-redirect pkg-ruby-extras.alioth.debian.org
+<VirtualHost <%= @vhost_listen_443 %> >
+	ServerName pkg-ruby-extras.alioth.debian.org
+	ServerAdmin debian-admin@debian.org
+	Use common-debian-service-ssl pkg-ruby-extras.alioth.debian.org
+	Use common-ssl-HSTS
+	Redirect / https://gemwatch.debian.net/
+</VirtualHost>
+
 Use common-dsa-vhost-https-redirect video.debconf.org
 <VirtualHost <%= @vhost_listen_443 %> >
 	ServerName video.debconf.org