From: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri, 27 May 2016 13:55:01 +0000 (+0200)
Subject: Add redirections from old debian-ports.org URLs to the new ones
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=22c578d5f540a7a40d1c4b84ed4c22367a3d1be6;p=mirror%2Fdsa-puppet.git

Add redirections from old debian-ports.org URLs to the new ones

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

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 e4d2dba53..a528960cf 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -177,6 +177,18 @@ Use common-dsa-vhost-https-redirect www.ports.debian.org
 	RedirectPermanent / https://www.ports.debian.org/
 </VirtualHost>
 
+<VirtualHost <%= vhost_listen %> >
+	ServerName incoming.debian-ports.org
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent / http://incoming.ports.debian.org/
+</VirtualHost>
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName ftp.debian-ports.org
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent / http://ftp.ports.debian.org/
+</VirtualHost>
+
 # video.debian.net
 ###################
 <VirtualHost <%= vhost_listen %> >