X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdebian%2Fapache.conf-incoming;h=26d78235c167c02402b1a4241fd467efee602801;hb=cb78af9b491621a6034af53607e9d3fba714cbe0;hp=0b6c4db287d0eaa3bd6e73b4471298eb4c2ec287;hpb=c148c30fb2ca015e56cf52c0534df0c461f5c527;p=dak.git
diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index 0b6c4db2..26d78235 100644
--- a/config/debian/apache.conf-incoming
+++ b/config/debian/apache.conf-incoming
@@ -13,14 +13,19 @@
Order deny,allow
+
+
+ Order deny,allow
+
+
+ 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/
-
-
+
Order allow,deny
Use DebianBuilddHostList
@@ -29,11 +34,20 @@
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
+ # for testing sbuild-db; rleigh@codelibre.net
+ # nagini.codelibre.net
+ 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)
@@ -79,6 +93,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 +146,7 @@
satisfy any
- CustomLog /var/log/apache2/incoming-access.log combined
+ CustomLog /var/log/apache2/incoming-access.log privacy
ErrorLog /var/log/apache2/incoming-error.log