X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fapache.conf-incoming;h=e00d04a09dc4e51b0be71bd469bec99669b3fe80;hb=e17180ff74df55b79132a808b58c4c0ed87d6430;hp=d43f198cfae3a0d653b289cc0422acd4bda2f13e;hpb=dbd2421bbf08cd15b61bfb66dfd40dfa55c706bf;p=dak.git

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index d43f198c..e00d04a0 100644
--- a/config/debian/apache.conf-incoming
+++ b/config/debian/apache.conf-incoming
@@ -1,6 +1,6 @@
 <VirtualHost *:80>
   ServerName incoming.debian.org
-  DocumentRoot /srv/incoming.debian.org/public
+  DocumentRoot /srv/ftp-master.debian.org/public/incoming.debian.org/public
 
   # deny by default
   <Directory />
@@ -8,28 +8,25 @@
   </Directory>
 
   # incoming dir, no subdir.  allow everyone except abusers.
-  <Directory /srv/incoming.debian.org/public>
+  <Directory /srv/ftp-master.debian.org/public/incoming.debian.org/public>
     IndexIgnore robots.txt
     Order deny,allow
   </Directory>
 
-  <Directory /srv/incoming.debian.org>
+  <Directory /srv/ftp-master.debian.org/public/incoming.debian.org>
     <Files robots.txt>
       Order deny,allow
     </Files>
   </Directory>
-  Alias /robots.txt /srv/incoming.debian.org/robots.txt
+  Alias /robots.txt /srv/ftp-master.debian.org/public/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
+  Alias /debian-backports /srv/backports-master.debian.org/mirror
+  Alias /debian-buildd /srv/ftp-master.debian.org/public/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/(ftp-master.debian.org/public/incoming\.debian\.org/(builddweb|debian-buildd/)|ftp\.debian\.org/mirror|backports-master\.debian\.org/mirror)">
 
-  <DirectoryMatch ~ "^/srv/(incoming\.debian\.org/(dists/|builddweb|debian-buildd/)|ftp\.debian\.org/mirror)">
     Order allow,deny
 
     Use DebianBuilddHostList
@@ -38,7 +35,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
@@ -48,6 +45,10 @@
     allow from 80.68.93.164
     allow from 2001:41c8:1:5750::2
 
+    # for d-i; kibi@d.o
+    # home.mraw.org
+    allow from 82.236.137.215
+
     # Should be in DSA list
     # amd64
     # vitry (archive rebuild)
@@ -93,6 +94,8 @@
     allow from 80.87.129.151
     # ironforge.sceen.net.
     allow from 46.105.42.111
+    # mahler.debian.net
+    allow from 178.78.231.178
 
     # ia64
     ## mundi
@@ -139,12 +142,12 @@
 
     AuthType Basic
     AuthName "incoming.debian.org"
-    AuthUserFile /srv/incoming.debian.org/htpasswd
+    AuthUserFile /srv/ftp-master.debian.org/public/incoming.debian.org/htpasswd
     require valid-user
     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>