Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[mirror/dsa-puppet.git] / modules / apache2 / files / common / etc / apache2 / sites-available / www.debian.org

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 847bd37..89fb0e3 100644 (file)
--- a/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org
+++ b/modules/apache2/files/common/etc/apache2/sites-available/www.debian.org
@@ -25,6 +25,9 @@
   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
   AddLanguage en .en
@@ -68,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 maintenance.html index index.html index.shtml index.htm
+  DirectoryIndex maintenance index index.html index.shtml index.htm
 
   <Files *.html.es>
     ForceType text/html