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=879be66151936a34d46617b4ff5d67ea329450c5;hpb=b22631bbcb3adc2f8bb05b05e3414456cdb68f01;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 879be6615..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
@@ -1,5 +1,10 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
# Need to turn on negotiation_module
-
+
Options +MultiViews +FollowSymLinks +Indexes
AddHandler type-map var
# Make sure that the srm.conf directive is commented out.
@@ -79,20 +84,21 @@
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
- RewriteRule ^(.*)$ http://www.debian.org/$1 [R=301,L]
+ RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
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
@@ -103,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