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=89fb0e30a1c42698bdd55f519bdf0129eb2726c2;hb=54bc6c03be53bd3f446a3e7a1ee9724d6418b72a;hp=d80d250cda81c758dad811c43b79a5f7c513414b;hpb=50297d3c06f0419fd3d031df73178f020ffafbc8;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 d80d250cd..89fb0e30a 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
-<Directory /org/www.debian.org/www/>
+<Directory /srv/www.debian.org/www/>
   Options +MultiViews +FollowSymLinks +Indexes
   AddHandler type-map var
   # Make sure that the srm.conf directive is commented out.
@@ -17,6 +22,11 @@
   ExpiresDefault "access plus 1 day"
   ExpiresByType image/gif "access plus 1 week"
   ExpiresByType image/jpeg "access plus 1 week"
+  ExpiresByType image/png "access plus 1 week"
+  ExpiresByType image/x-icon "access plus 1 week"
+
+  # FileEtag needs to be the same across mirrors (used for caching, ignore inode)
+  FileEtag MTime Size
 
   # language stuff, for web site translations
   # for boot-floppies docs only: sk
@@ -61,7 +71,7 @@
   AddLanguage zh-TW .zh-tw
   LanguagePriority en fr de it es ja pl hr da pt pt-br fi zh-cn zh-hk zh-tw cs sv ko no nb ru tr eo ar nl hu ro sk el ca en-us en-gb id lt sl bg uk hy vi
 
-  DirectoryIndex index index.html index.shtml index.htm
+  DirectoryIndex maintenance index index.html index.shtml index.htm
 
   <Files *.html.es>
     ForceType text/html
@@ -79,11 +89,12 @@
 <VirtualHost *:80>
    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]
@@ -92,7 +103,7 @@
 <VirtualHost *:80>
    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 +114,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