X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ffiles%2Fcommon%2Fetc%2Fapache2%2Fsites-available%2Fwww.debian.org;h=37f2517584259c7dde68bc23db9a3bb5717a7c05;hb=65879be81dabbb7a04b483aa16317c57194aff21;hp=898bce65241bdb73199451c61f474eaea38a47b4;hpb=151f6899a9ad1cd5ffc719a822947b3f43e2ac38;p=mirror%2Fdsa-puppet.git 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 898bce652..37f251758 100644 --- a/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org +++ b/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org @@ -84,11 +84,11 @@ 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 + ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at 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 - RewriteLog /var/log/apache2/www-other.debian.org-recirect.log + RewriteLog /var/log/apache2/www-other.debian.org-redirect.log RewriteLogLevel 1 RewriteEngine on @@ -98,7 +98,7 @@ ServerName www.debian.org ServerAdmin webmaster@debian.org - ServerAlias debian.org www-staging.debian.org + ServerAlias www-*.debian.org DocumentRoot /srv/www.debian.org/www/ ErrorLog /var/log/apache2/www.debian.org-error.log CustomLog /var/log/apache2/www.debian.org-access.log combined @@ -109,6 +109,9 @@ # this behavior, and proxies will be allowed to cache the documents. CacheNegotiatedDocs On +# Custom Error + ErrorDocument 404 /devel/website/errors/404 + # the joys of backwards compatibility Redirect /cgi-bin/cvsweb http://cvs.debian.org Redirect /Lists-Archives http://lists.debian.org