(www) Add redirections for some old Refresh hacks

[dsa-puppet.git] / modules / apache2 / files / common / etc / apache2 / sites-available / www.debian.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 1606a11d478ff83712acb9492b1ac12cb4634cce..c9b60489b84a5856ce14c74babf8ffee871786f3 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
@@ -89,7 +89,7 @@
 <VirtualHost *:80>
    ServerName www.nl.debian.org
    ServerAdmin webmaster@debian.org
-   ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at
+   ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at www.debian.eu debian.eu
    DocumentRoot /srv/www.debian.org/www/
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
    CustomLog /var/log/apache2/www-other.debian.org-access.log combined
@@ -138,13 +138,23 @@
 
    Userdir http://people.debian.org/~*/   
 
+   RedirectPermanent /devel/todo/ /devel/wnpp/help_requested_bypop
+   RedirectPermanent /doc/FAQ /doc/manuals/debian-faq
+   RedirectPermanent /doc/manuals/debian-fr-howto /doc/manuals/fr/debian-fr-howto
+   RedirectPermanent /doc/manuals/reference /doc/manuals/debian-reference
+   RedirectPermanent /doc/packaging-manuals/developers-reference /doc/manuals/developers-reference
+   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 /zh/ /international/Chinese/
    RedirectPermanent /chinese/ /international/Chinese/
    RedirectPermanent /devel/help /devel/join/
    RedirectPermanent /distrib/books /doc/books
+   RedirectPermanent /distrib/floppyinst /distrib/netinst
+   RedirectPermanent /distrib/netboot /distrib/netinst
    RedirectPermanent /distrib/vendors /CD/vendors/
+   RedirectPermanent /distrib/cd /CD/
    RedirectPermanent /distrib/cdinfo /CD/vendors/info
    RedirectPermanent /related_links /misc/related_links
    RedirectPermanent /ports/laptops /misc/laptops/
@@ -155,6 +165,7 @@
    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 /mirror/mirrors_full.html /mirror/list-full.html
    RedirectPermanent /mirrors /mirror
    RedirectPermanent /News/project /News/weekly
@@ -168,6 +179,15 @@
    RedirectPermanent /releases/6.0 /releases/squeeze
    RedirectPermanent /releases/unstable /releases/sid
 
+   RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]
+   RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04.html#submit-bug [NE,R=301]
+   RewriteRule ^/devel/debian-installer/hooks(.*) http://d-i.alioth.debian.org/doc/internals/apb.html [R=301]
+   RewriteRule ^/doc/packaging-manuals/mime-policy(.*) /doc/debian-policy/ch-opersys.html#s-mime [NE,R=301]
+
+   RewriteRule ^/volatile/index.* - [S=1]
+   RewriteRule ^/volatile/.+ /volatile/ [L,R=301]
+   RewriteRule ^/devel/debian-volatile/.* /volatile/ [R=301]
+
 # Offer a Redirect to DSA without knowing year #474730
    RewriteMap dsa txt:/srv/www.debian.org/www/security/map-dsa.txt
    RewriteRule ^/security/dsa-(\d+)(\..*)? /security/${dsa:$1}$2 [R=301]
@@ -175,10 +195,17 @@
 # Compatibility after SGML -> DocBook
 # Debian Reference #624239
    RewriteMap reference txt:/srv/www.debian.org/www/doc/map-reference.txt
-   RewriteRule ^/doc/manuals/reference/ch-support(.*)  /support$1 [R=301]
-   RewriteRule ^/doc/manuals/reference/ch-([^\.]+)(.*)  /doc/manuals/reference/${reference:$1}$2 [R=301]
-   RewriteRule ^/doc/manuals/reference/ap-appendix(.*) /doc/manuals/reference/apa$1 [R=301]
-   RewriteRule ^/doc/manuals/reference/footnotes(.*)   /doc/manuals/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]