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=37f2517584259c7dde68bc23db9a3bb5717a7c05;hpb=65879be81dabbb7a04b483aa16317c57194aff21;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 37f251758..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
@@ -22,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
@@ -66,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