Merge remote-tracking branch 'origin/master'

[dak.git] / config / debian / apache.conf-incoming

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index 470a529f65da617c543230fcbe87aa3aad5bb239..d43f198cfae3a0d653b289cc0422acd4bda2f13e 100644 (file)
--- a/config/debian/apache.conf-incoming
+++ b/config/debian/apache.conf-incoming
@@ -13,6 +13,13 @@
     Order deny,allow
   </Directory>
 
+  <Directory /srv/incoming.debian.org>
+    <Files robots.txt>
+      Order deny,allow
+    </Files>
+  </Directory>
+  Alias /robots.txt /srv/incoming.debian.org/robots.txt
+
   # buildd direct access -- buildds only
   Alias /debian /srv/ftp.debian.org/mirror
   Alias /debian-buildd /srv/incoming.debian.org/debian-buildd
@@ -20,6 +27,7 @@
   # New suite aliases
   Alias /buildd-unstable /srv/incoming.debian.org/dists/unstable/current/
   Alias /buildd-experimental /srv/incoming.debian.org/dists/experimental/current/
+  Alias /buildd-squeeze-backports /srv/incoming.debian.org/dists/squeeze-backports/current/
 
   <DirectoryMatch ~ "^/srv/(incoming\.debian\.org/(dists/|builddweb|debian-buildd/)|ftp\.debian\.org/mirror)">
     Order allow,deny