(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 02f76353ca9cfbceec5f44f744910f10be77b322..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
@@ -146,11 +146,15 @@
    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/
@@ -180,6 +184,10 @@
    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]