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

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index 0460a07c..37c417ca 100644
--- a/config/debian/apache.conf-incoming
+++ b/config/debian/apache.conf-incoming
@@ -13,20 +13,19 @@
     Order deny,allow
   </Directory>
 
-  <Files /srv/incoming.debian.org/robots.txt>
-    Order deny,allow
-  </Files>
+  <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|debian-buildd/)|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
@@ -35,7 +34,7 @@
     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
@@ -141,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>