X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=197c60c379782a0e633d07d296bad79df530f3bd;hb=eedd9b7a5e400500547a9e40bb9bd2e415dfb701;hp=6ad69d962f52626de0e433674d67cbcfcdcf6f14;hpb=c7311df6f0c524b860ab8738cfffd4b2acfc13bd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 6ad69d962..197c60c37 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -97,9 +97,6 @@
    ServerAlias www.debian.eu
    ServerAlias debian.eu
 
-   ServerAlias www.debian.fi
-   ServerAlias debian.fi
-
    ServerAlias www.debian.nl
    ServerAlias debian.nl
 
@@ -194,6 +191,9 @@
    RedirectPermanent /ports/ppc64   /ports/powerpc
    RedirectPermanent /ports/ppc64el   /ports/powerpc
    RedirectPermanent /ports/powerpcspe   /ports/powerpc
+   Redirect /ports/riscv64   https://wiki.debian.org/RISC-V
+   Redirect /ports/x32   https://wiki.debian.org/X32Port
+   Redirect /ports/sh4   https://wiki.debian.org/SH4
    RedirectPermanent /mirror/official_sponsors /mirror/sponsors
    RedirectPermanent /mirror/official /mirror/list
    RedirectPermanent /mirror/mirrors_full.html /mirror/list-full.html
@@ -247,6 +247,18 @@
    RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/footnotes$1 !-f
    RewriteRule ^/doc/manuals/debian-reference/footnotes(.+)   /doc/manuals/debian-reference/index$1 [L,R=301]
    RewriteRule ^/doc/manuals/debian-reference/footnotes$      /doc/manuals/debian-reference/          [R=301]
+
+# DevRef filename changes c2016
+   RedirectMatch permanent ^(/doc/manuals/developers-reference)/scope(\.[a-z]{2})?.html                 $1/ch01$2.html
+   RedirectMatch permanent ^(/doc/manuals/developers-reference)/new-maintainer(\.[a-z]{2})?.html        $1/ch02$2.html
+   RedirectMatch permanent ^(/doc/manuals/developers-reference)/developer-duties(\.[a-z]{2})?.html      $1/ch03$2.html
+   RedirectMatch permanent ^(/doc/manuals/developers-reference)/resources(\.[a-z]{2})?.html             $1/ch04$2.html
+   RedirectMatch permanent ^(/doc/manuals/developers-reference)/pkgs(\.[a-z]{2})?.html                  $1/ch05$2.html
+   RedirectMatch permanent ^(/doc/manuals/developers-reference)/best-pkging-practices(\.[a-z]{2})?.html $1/ch06$2.html
+   RedirectMatch permanent ^(/doc/manuals/developers-reference)/beyond-pkging(\.[a-z]{2})?.html         $1/ch07$2.html
+   RedirectMatch permanent ^(/doc/manuals/developers-reference)/l10n(\.[a-z]{2})?.html                  $1/ch08$2.html
+   RedirectMatch permanent ^(/doc/manuals/developers-reference)/tools(\.[a-z]{2})?.html                 $1/apa$2.html
+
 # New Maintainers' Guide
    RewriteRule ^/doc/(manuals/)?maint-guide/ch-(.*) /doc/manuals/maint-guide/$2 [R=301]
    RewriteRule ^/doc/(manuals/)?maint-guide/footnotes(.*) /doc/manuals/maint-guide/index$2 [R=301]