Merge branch 'security'

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

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index c019bf5e4bdeae29d2b442249b6a2858c8fbac19..0edf6dcef7fb32c29da6f4d21b125065d5aa1dd4 100644 (file)
--- a/config/debian/apache.conf-incoming
+++ b/config/debian/apache.conf-incoming
@@ -1,6 +1,7 @@
 <VirtualHost *:80>
   ServerName incoming.debian.org
   DocumentRoot /srv/incoming.debian.org/public
+
   # deny by default
   <Directory />
     Order allow,deny
@@ -34,15 +35,17 @@
     allow from 213.188.99.214
     allow from 213.188.99.208
   # amd64
-    # fivetimesnine.de - fs
-    allow from 194.0.163.247
-    # excelsior
-    allow from 77.243.184.66
-    # thukydides, HE
-    allow from 78.47.240.182
     # barber
     allow from 194.177.211.203
     allow from 2001:648:2ffc:deb:214:22ff:feb2:2370
+    # brahms
+    Allow from 206.12.19.115
+    # vitry (archive rebuild)
+    allow from 194.177.211.206
+    allow from 2001:648:2ffc:deb:214:22ff:feb2:122c
+    # krenek (archive rebuild)
+    allow from 194.177.211.207
+    allow from 2001:648:2ffc:deb:214:22ff:feb1:ff56
   # arm
     # netwinder
     allow from 192.133.104.24
@@ -67,6 +70,14 @@
     allow from 157.193.39.233
     # ancina
     allow from 157.193.39.13
+    # arnold
+    allow from 217.140.96.57
+    # alain
+    allow from 217.140.96.58
+    # alwyn
+    allow from 217.140.96.59
+    # antheil
+    allow from 217.140.96.60
   # hppa
     # sarti
     allow from 193.201.200.199
@@ -86,14 +97,8 @@
     # back / mozart (xen domains; NOT .debian.org)
     allow from 80.87.129.151
   # i386
-    # puccini
-    Allow from 87.106.4.56
-    # brahms
-    Allow from 206.12.19.115
     # murphy
     Allow from 70.103.162.31
-    # demosthenes, HE
-    allow from 78.47.223.98
     # biber
     allow from 194.177.211.204
     allow from 2001:648:2ffc:deb:214:22ff:feb2:1268
@@ -102,8 +107,6 @@
     allow from 193.201.200.200
     # mundi
     allow from 192.25.206.62
-    # zx6000.gag.com
-    allow from 192.133.104.50
     # alkman
     allow from 192.25.206.63
   # mips
@@ -133,13 +136,12 @@
   # powerpc
     # static-72-66-115-54.washdc.fios.verizon.net
     allow from 72.66.115.54
-    # malo
-    allow from 140.211.166.27
     # praetorius
     allow from 130.239.18.121
-    # purcell
-    allow from 82.195.75.69
-    allow from 2001:41b8:202:deb:20a:95ff:fe6c:3c02
+    # poulenc
+    allow from 144.32.168.77
+    # porpora
+    allow from 144.32.168.78
   # s390
     # debian01.zseries
     allow from 195.243.109.161
@@ -177,7 +179,6 @@
 # dynamics use password auth
     AuthType Basic
     AuthName "incoming.debian.org"
-    # We do not like passwords, unless for good reason.
     AuthUserFile /srv/incoming.debian.org/htpasswd
     require valid-user
     satisfy any