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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  start replacing removed package references with references to debian.org package
  oops, need this one.  Put it back as well
  oops, need this one.  Put it back as well
  oops, need this one.  Put it back as well
  oops, need this one.  Put it back in the right module
  add debian.org to manifest and remove a bunch of stuff it depends on
  directory wants package installed first
  pescetti to squeeze

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 b4b0951..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
@@ -71,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