X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config%2Fdebian%2Fapache.conf-incoming;h=9922b46f71e6f89d4e0e8c39275cd24550e8a5c6;hb=4ba12d4b23d87194df5e415f58608b99ab6fd50a;hp=480ce0f8f285024ba94caf6c2a248da151e75642;hpb=b58c5c943f5a729b4b0bb3a3c36e2a8f8063b9a3;p=dak.git

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index 480ce0f8..9922b46f 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,19 +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/ftp-master.debian.org/public/incoming.debian.org>
+    <Files robots.txt>
+      Order deny,allow
+    </Files>
+  </Directory>
+  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-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/
+  <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)|ftp\.debian\.org/mirror)">
     Order allow,deny
 
     Use DebianBuilddHostList
@@ -29,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
@@ -39,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)
@@ -84,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
@@ -130,7 +142,7 @@
 
     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>