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 7784d04..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
@@ -1,5 +1,17 @@
 # puppet maintained
 
+######################
+# deb.debian.org
+<% if scope.function_has_static_component(['deb.debian.org']) -%>
+<Macro vhost-deb.debian.org-extra>
+       Redirect /debian/           http://cdn-fastly.deb.debian.org/debian/
+       Redirect /debian-debug/     http://cdn-fastly.deb.debian.org/debian-debug/
+       Redirect /debian-ports/     http://cdn-fastly.deb.debian.org/debian-ports/
+       Redirect /debian-security/  http://cdn-fastly.deb.debian.org/debian-security/
+</Macro>
+<% end -%>
+
+
 <%=
 
 def vhost(lines, sn, type=nil, extra=nil)
@@ -16,8 +28,9 @@ end
 
 lines = []
 vhost(lines, "mozilla.debian.net")
-vhost(lines, "backports.debian.org")
+vhost(lines, "backports.debian.org", "ssl")
 vhost(lines, "incoming.debian.org")
+vhost(lines, "incoming.ports.debian.org")
 vhost(lines, "debdeltas.debian.net")
 vhost(lines, "news.debian.net"         , "ssl")
 vhost(lines, "debaday.debian.net"      , "ssl")
@@ -49,17 +62,6 @@ vhost(lines, "deb.debian.org", "with-extra", '"Use vhost-deb.debian.org-extra"')
 lines.join("\n")
 -%>
 
-
-######################
-# deb.debian.org
-<% if scope.function_has_static_component(['deb.debian.org']) -%>
-<Macro vhost-deb.debian.org-extra>
-       RedirectPermanent /debian/           http://cdn-fastly.deb.debian.org/debian/
-       RedirectPermanent /debian-debug/     http://cdn-fastly.deb.debian.org/debian-debug/
-       RedirectPermanent /debian-security/  http://cdn-fastly.deb.debian.org/debian-security/
-</Macro>
-<% end -%>
-
 ######################
 # metadata.ftp-master.debian.org
 <% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%>
@@ -129,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
@@ -137,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>
@@ -147,12 +155,7 @@ lines.join("\n")
                AllowOverride FileInfo Indexes Options=Multiviews
                Options Multiviews Indexes FollowSymLinks Includes
                IndexOptions FancyIndexing NameWidth=*
-               <% if @lsbmajdistrelease > '7' -%>
-                       Require all granted
-               <% else -%>
-                       Order allow,deny
-                       Allow from all
-               <% end -%>
+               Require all granted
        </Directory>
 
        AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
@@ -164,17 +167,29 @@ lines.join("\n")
        ServerName www.debian-ports.org
        ServerAlias debian-ports.org
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent /archive/           http://archive.ports.debian.org/archive/
-       RedirectPermanent /debian-cd/         http://archive.ports.debian.org/debian-cd/
-       RedirectPermanent /debian-snapshot/   http://archive.ports.debian.org/debian-snapshot/
-       RedirectPermanent /debian/            http://archive.ports.debian.org/debian/
-       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 / 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 ports.debian.net
+       ServerName ftp.debian-ports.org
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent / http://www.ports.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