(www) Update Debian reference redirections

Only apply to existing pages.

Signed-off-by: David Prévot <taffit@debian.org>
Signed-off-by: Peter Palfrader <peter@palfrader.org>

diff --git a/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org b/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org
index a47669d0c61d9e906c86c3dec4e07eec650aa287..846bf38eaf04f21c6de3a37bc0fa2b715aade1b5 100644 (file)
--- a/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org
+++ b/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org
@@ -185,10 +185,17 @@
 # Compatibility after SGML -> DocBook
 # Debian Reference #624239
    RewriteMap reference txt:/srv/www.debian.org/www/doc/map-reference.txt
-   RewriteRule ^/doc/manuals/debian-reference/ch-support(.*)  /support$1 [R=301]
-   RewriteRule ^/doc/manuals/debian-reference/ch-([^\.]+)(.*) /doc/manuals/debian-reference/${reference:$1}$2 [R=301]
-   RewriteRule ^/doc/manuals/debian-reference/ap-appendix(.*) /doc/manuals/debian-reference/apa$1 [R=301]
-   RewriteRule ^/doc/manuals/debian-reference/footnotes(.*)   /doc/manuals/debian-reference/index$1 [R=301]
+   RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/ch-support$1 !-f
+   RewriteRule ^/doc/manuals/debian-reference/ch-support(.*)  /support$1 [L,R=301]
+   RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/${reference:$1}$2 -f
+   RewriteRule ^/doc/manuals/debian-reference/ch-([^\.]+)(.+) /doc/manuals/debian-reference/${reference:$1}$2 [L,R=301]
+   RewriteRule ^/doc/manuals/debian-reference/ch-([^\.]+)$    /doc/manuals/debian-reference/${reference:$1}     [R=301]
+   RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/apa$1 -f
+   RewriteRule ^/doc/manuals/debian-reference/ap-appendix(.+) /doc/manuals/debian-reference/apa$1 [L,R=301]
+   RewriteRule ^/doc/manuals/debian-reference/ap-appendix$    /doc/manuals/debian-reference/apa     [R=301]
+   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]
 # 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]