<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 />
</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-backports /srv/backports-master.debian.org/mirror
- Alias /debian-buildd /srv/incoming.debian.org/debian-buildd
+ Alias /debian-buildd /srv/ftp-master.debian.org/public/incoming.debian.org/debian-buildd
+
+ <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/(builddweb|debian-buildd/)|ftp\.debian\.org/mirror|backports-master\.debian\.org/mirror)">
Order allow,deny
Use DebianBuilddHostList
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)
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
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>