X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=1578c8948cae03c937c76eeff9eee92b3551571b;hb=dea39c11d4df6abb11c89f97b9988a664a0d1c3b;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..1578c8948 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -89,7 +89,7 @@
 <VirtualHost <%= vhost_listen %> >
    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 www.debian.eu debian.eu debian.com
+   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 debian.com debian.us www.debian.us
    DocumentRoot <%= wwwdo_document_root %>/
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
    CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
@@ -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]