X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fapache.conf-incoming;h=37c417ca643f1d93ebd4fdedce44196a56071830;hb=bfdfe34b68b54ac28b8f92365e2b31b78285455a;hp=2181fe17cd98d26850739c18a41c7c311692d623;hpb=37ba05465b0dbea22450401c2cb056b26a781887;p=dak.git

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index 2181fe17..37c417ca 100644
--- a/config/debian/apache.conf-incoming
+++ b/config/debian/apache.conf-incoming
@@ -13,14 +13,19 @@
     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-backports /srv/backports-master.debian.org/mirror
+  Alias /debian-buildd /srv/incoming.debian.org/debian-buildd
 
-  # New suite aliases
-  Alias /buildd-unstable /srv/incoming.debian.org/dists/unstable/current/
-  Alias /buildd-experimental /srv/incoming.debian.org/dists/experimental/current/
-
-  <DirectoryMatch ~ "^/srv/(incoming\.debian\.org/(dists/|builddweb)|ftp\.debian\.org/mirror)">
+  <DirectoryMatch ~ "^/srv/(incoming\.debian\.org/(builddweb|debian-buildd/)|ftp\.debian\.org/mirror|backports-master\.debian\.org/mirror)">
     Order allow,deny
 
     Use DebianBuilddHostList
@@ -29,11 +34,16 @@
     allow from 206.12.19.8
 
     # franck.d.o
-    allow from 128.148.34.3
+    allow from 138.16.160.12
 
     # test access to check functionality, ganneff
     allow from 213.146.108.162
 
+    # for testing sbuild-db; rleigh@codelibre.net
+    # nagini.codelibre.net
+    allow from 80.68.93.164
+    allow from 2001:41c8:1:5750::2
+
     # Should be in DSA list
     # amd64
     # vitry (archive rebuild)
@@ -77,6 +87,8 @@
     allow from 192.33.98.55
     ## back / mozart (xen domains; NOT .debian.org)
     allow from 80.87.129.151
+    # ironforge.sceen.net.
+    allow from 46.105.42.111
 
     # ia64
     ## mundi
@@ -128,7 +140,7 @@
     satisfy any
   </DirectoryMatch>
 
-  CustomLog               /var/log/apache2/incoming-access.log combined
+  CustomLog               /var/log/apache2/incoming-access.log privacy
   ErrorLog                /var/log/apache2/incoming-error.log
 
 </VirtualHost>