Improve ftp.debian-ports.org redirections (a bit more)

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

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 3feff61..8821896 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -131,7 +131,10 @@ lines.join("\n")
 ######################
 # www.ports.debian.org
 <% if scope.function_has_static_component(['www.ports.debian.org']) -%>
-<Virtualhost <%= vhost_listen %> >
+
+Use common-dsa-vhost-https-redirect www.ports.debian.org
+
+<Virtualhost <%= vhost_listen_443 %> >
        ServerName www.ports.debian.org
        ServerAlias www.ports-backend.debian.org
        ServerAdmin debian-admin@lists.debian.org
@@ -139,6 +142,9 @@ lines.join("\n")
        ErrorLog /var/log/apache2/www.ports.debian.org-error.log
        CustomLog /var/log/apache2/www.ports.debian.org-access.log privacy
 
+       Use common-debian-service-ssl www.ports.debian.org
+       Use common-ssl-HSTS
+
        <IfModule mod_userdir.c>
                UserDir disabled
        </IfModule>
@@ -161,14 +167,29 @@ lines.join("\n")
        ServerName www.debian-ports.org
        ServerAlias debian-ports.org
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent / http://www.ports.debian.org/
+       RedirectPermanent / https://www.ports.debian.org/
 </VirtualHost>
 
 <VirtualHost <%= vhost_listen %> >
        ServerName ports.debian.org
        ServerAlias ports.debian.net
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent / http://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 /archive http://www.ports.debian.org
+       RedirectPermanent /debian http://ftp.ports.debian.org/debian-ports
+       RedirectPermanent /debian-cd http://ftp.ports.debian.org/debian-ports-cd
+       RedirectPermanent / http://ftp.ports.debian.org/
 </VirtualHost>
 
 # video.debian.net