X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=db88d9c02076b3df6f8f7874972591bcb257cf76;hb=6fd98e708bc9828d8d860eb32745b1cbd51ec445;hp=118ce80109008cd0d37a18fd91e4df3dfa4f70c6;hpb=49223ad1e8bf7a056e780783c3155d9099f88352;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 118ce8010..db88d9c02 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -136,7 +136,9 @@
    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
 
-   Userdir http://people.debian.org/~*/   
+   <IfModule mod_userdir.c>
+      UserDir disabled
+   </IfModule>
 
    RedirectPermanent /devel/todo/ /devel/wnpp/help_requested_bypop
    RedirectPermanent /doc/FAQ /doc/manuals/debian-faq
@@ -162,10 +164,12 @@
    RedirectPermanent /misc/README.non-US /mirror/list.non-US
    RedirectPermanent /intl /international
    RedirectPermanent /ports/armel  /ports/arm
+   RedirectPermanent /ports/armhf  /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 /mirror/mirrors_full.html /mirror/list-full.html
    RedirectPermanent /mirrors /mirror
    RedirectPermanent /News/project /News/weekly
@@ -177,6 +181,8 @@
    RedirectPermanent /releases/4.0 /releases/etch
    RedirectPermanent /releases/5.0 /releases/lenny
    RedirectPermanent /releases/6.0 /releases/squeeze
+   RedirectPermanent /releases/7 /releases/wheezy
+   RedirectPermanent /releases/8 /releases/jessie
    RedirectPermanent /releases/unstable /releases/sid
 
    RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]