The debian-backports repository is obsolete: stop redirecting www.backports.org ...

[mirror/dsa-puppet.git] / modules / roles / templates / apache-www.debian.org.erb

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 8c39f29..4ecbf4e 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -119,6 +119,9 @@
    ServerAlias www.debian.eu
    ServerAlias debian.eu
 
+   ServerAlias www.debian.fi
+   ServerAlias debian.fi
+
    ServerAlias www.debian.com
    ServerAlias debian.com
 
@@ -168,11 +171,11 @@
    RewriteRule ^/(?!devel/website/errors/)(.*/)?404\.(.+)\.html$ /devel/website/errors/404.$2.html [L]
 
 # the joys of backwards compatibility
-   RedirectPermanent /cgi-bin/cvsweb http://cvs.debian.org
-   RedirectPermanent /Lists-Archives http://lists.debian.org
-   RedirectPermanent /search http://search.debian.org
-   RedirectPermanent /Packages http://packages.debian.org
-   RedirectPermanent /lintian http://lintian.debian.org
+   RedirectPermanent /cgi-bin/cvsweb https://cvs.debian.org
+   RedirectPermanent /Lists-Archives https://lists.debian.org
+   RedirectPermanent /search https://search.debian.org
+   RedirectPermanent /Packages https://packages.debian.org
+   RedirectPermanent /lintian https://lintian.debian.org
 
    RedirectPermanent /SPI http://www.spi-inc.org
 #   RedirectPermanent /OpenHardware http://www.openhardware.org
@@ -180,9 +183,9 @@
 
    RedirectPermanent /Bugs/db/ix/pseudopackages.html /Bugs/pseudo-packages
    RewriteEngine on
-   RewriteRule ^/Bugs/db/pa/l([^/]+).html$ http://bugs.debian.org/$1
-   RewriteRule ^/Bugs/db/[[:digit:]][[:digit:]]/([[:digit:]][[:digit:]][[:digit:]]+).html$ http://bugs.debian.org/$1
-   RewriteRule ^/Bugs/db/ma/l([^/]+).html$ http://bugs.debian.org/cgi-bin/pkgreport.cgi?maintenc=$1
+   RewriteRule ^/Bugs/db/pa/l([^/]+).html$ https://bugs.debian.org/$1
+   RewriteRule ^/Bugs/db/[[:digit:]][[:digit:]]/([[:digit:]][[:digit:]][[:digit:]]+).html$ https://bugs.debian.org/$1
+   RewriteRule ^/Bugs/db/ma/l([^/]+).html$ https://bugs.debian.org/cgi-bin/pkgreport.cgi?maintenc=$1
 
    <IfModule mod_userdir.c>
       UserDir disabled
@@ -196,7 +199,7 @@
    RedirectPermanent /doc/packaging-manuals/packaging-tutorial /doc/manuals/packaging-tutorial
    RedirectPermanent /doc/prospective-packages /devel/wnpp/
    RedirectPermanent /devel/maintainer_contacts /intro/organization
-   RedirectPermanent /devel/debian-installer/gtk-frontend http://wiki.debian.org/DebianInstaller/GUI
+   RedirectPermanent /devel/debian-installer/gtk-frontend https://wiki.debian.org/DebianInstaller/GUI
    RedirectPermanent /zh/ /international/Chinese/
    RedirectPermanent /chinese/ /international/Chinese/
    RedirectPermanent /devel/help /devel/join/
@@ -213,11 +216,15 @@
    RedirectPermanent /intl /international
    RedirectPermanent /ports/armel  /ports/arm
    RedirectPermanent /ports/armhf  /ports/arm
+   RedirectPermanent /ports/arm64  /ports/arm
    RedirectPermanent /ports/mipsel /ports/mips
    RedirectPermanent /ports/kfreebsd-amd64 /ports/kfreebsd-gnu
    RedirectPermanent /ports/kfreebsd-i386  /ports/kfreebsd-gnu
    RedirectPermanent /ports/sparc64 /ports/sparc
    RedirectPermanent /ports/s390x   /ports/s390
+   RedirectPermanent /ports/ppc64   /ports/powerpc
+   RedirectPermanent /ports/ppc64el   /ports/powerpc
+   RedirectPermanent /ports/powerpcspe   /ports/powerpc
    RedirectPermanent /mirror/mirrors_full.html /mirror/list-full.html
    RedirectPermanent /mirrors /mirror
    RedirectPermanent /News/project /News/weekly
@@ -234,6 +241,7 @@
    RedirectPermanent /releases/9 /releases/stretch
    RedirectPermanent /releases/10 /releases/buster
    RedirectPermanent /releases/unstable /releases/sid
+   RedirectPermanent /support/ /support
 
    RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]
    RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04.html#submit-bug [NE,R=301]
@@ -269,6 +277,10 @@
 # Canonical place for manuals under /doc/manuals/
    RewriteCond %{DOCUMENT_ROOT}/doc/manuals/$1 -d
    RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
+   RewriteRule ^/doc/manuals/?$ /doc/ [L,R=301]
+
+# Relocation of blends pages
+   RewriteRule ^/devel/hamradio(.*)$ /blends/hamradio$1 [R=301,L]
 </Macro>