incoming log has tag privacy (update with live version from franck)

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

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index d43f198cfae3a0d653b289cc0422acd4bda2f13e..37c417ca643f1d93ebd4fdedce44196a56071830 100644 (file)
--- a/config/debian/apache.conf-incoming
+++ b/config/debian/apache.conf-incoming
@@ -22,14 +22,10 @@
 
   # 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/
-  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)">
+  <DirectoryMatch ~ "^/srv/(incoming\.debian\.org/(builddweb|debian-buildd/)|ftp\.debian\.org/mirror|backports-master\.debian\.org/mirror)">
     Order allow,deny
 
     Use DebianBuilddHostList
@@ -38,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
@@ -144,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>