[dak/master] Add the apache configs
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/debian/apache.conf-ftp | 7 ++
config/debian/apache.conf-incoming | 189 ++++++++++++++++++++++++++++++++++++
2 files changed, 196 insertions(+), 0 deletions(-)
create mode 100644 config/debian/apache.conf-ftp
create mode 100644 config/debian/apache.conf-incoming
diff --git a/config/debian/apache.conf-ftp b/config/debian/apache.conf-ftp
new file mode 100644
index 0000000..fa01961
--- /dev/null
+++ b/config/debian/apache.conf-ftp
@@ -0,0 +1,7 @@
+ # virtualhost is defined in the file including this file.
+
+ ServerName ftp-master.debian.org
+ DocumentRoot /srv/ftp.debian.org/web
+ Redirect permanent /proposed-updates.html http://release.debian.org/proposed-updates/stable.html
+ Redirect permanent /oldstable-proposed-updates.html http://release.debian.org/proposed-updates/oldstable.html
+ Redirect permanent /testing/hints/transitions.yaml http://ftp-master.debian.org/transitions.yaml
diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
new file mode 100644
index 0000000..c019bf5
--- /dev/null
+++ b/config/debian/apache.conf-incoming
@@ -0,0 +1,189 @@
+<VirtualHost *:80>
+ ServerName incoming.debian.org
+ DocumentRoot /srv/incoming.debian.org/public
+ # deny by default
+ <Directory />
+ Order allow,deny
+ </Directory>
+
+ # incoming dir, no subdir. allow everyone except abusers.
+ <Directory /srv/incoming.debian.org/public>
+ IndexIgnore robots.txt
+ Order deny,allow
+ </Directory>
+
+ # buildd direct access -- buildds only
+ Alias /debian /srv/ftp.debian.org/mirror
+
+ # 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/(incoming\.debian\.org/(dists/|builddweb)|ftp\.debian\.org/mirror)">
+ Order allow,deny
+ # buildd.d.o, cimarosa
+ allow from 206.12.19.8
+ # franck.d.o
+ allow from 128.148.34.3
+ # test access to check functionality, ganneff
+ allow from 213.146.108.162
+ # alpha
+ # goetz
+ allow from 193.62.202.26
+ # goedel (temporarily allow two addresses; see RT#1287)
+ 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
+ # arm
+ # netwinder
+ allow from 192.133.104.24
+ #
+ allow from 217.147.81.26
+ # toffee
+ allow from 78.32.9.218
+ #
+ allow from 86.3.74.169
+ # nw1.xandros
+ allow from 67.210.160.89
+ # nw2.xandros
+ allow from 67.210.160.90
+ # hdges.billgatliff
+ allow from 209.251.101.204
+ # armel
+ # arcadelt
+ allow from 82.195.75.87
+ # argento
+ allow from 93.94.130.160
+ # allegri
+ allow from 157.193.39.233
+ # ancina
+ allow from 157.193.39.13
+ # hppa
+ # sarti
+ allow from 193.201.200.199
+ # bld3.mmjgroup
+ allow from 192.25.206.243
+ # peri
+ allow from 192.25.206.15
+ #
+ allow from 192.25.206.68
+ # lafayette
+ allow from 147.215.7.160
+ # paer
+ allow from 192.25.206.11
+ # hurd-i386
+ # rossini (NOT .debian.org)
+ allow from 192.33.98.55
+ # 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
+ # ia64
+ # caballero
+ 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
+ #
+ allow from 217.147.81.21
+ # ball
+ allow from 82.195.75.70
+ allow from 2001:41b8:202:deb:202:4cff:fefe:d09
+ # mayr
+ allow from 140.211.166.58
+ # sigrun, aba
+ allow from 82.195.75.68
+ allow from 2001:41b8:202:deb:a00:69ff:fe08:30c6
+ # corelli
+ allow from 206.12.19.16
+ # lucatelli
+ allow from 206.12.19.15
+ # mipsel
+ # rem
+ allow from 195.71.99.217
+ # mayer
+ allow from 140.211.166.78
+ # monteverdi
+ allow from 78.47.2.111
+ # kritias, aba
+ allow from 78.46.213.163
+ # 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
+ # s390
+ # debian01.zseries
+ allow from 195.243.109.161
+ # l003092.zseriespenguins.ihost.com
+ allow from 32.97.40.46
+ #
+ allow from 148.100.96.45
+ #
+ allow from 148.100.96.52
+ # lxdebian.bfinv
+ allow from 80.245.147.60
+ # zandonai
+ allow from 80.245.147.46
+ # sparc
+ # spontini
+ allow from 206.12.19.14
+ # lebrun
+ allow from 193.198.184.10
+ # schroeder
+ allow from 193.198.184.11
+ # titan.ayous.org ('non-standard' buildd; contact HE)
+ allow from 82.195.75.33
+ # kfreebsd
+ # amd64
+ # fasch
+ allow from 194.177.211.201
+ # i386
+ # himalai1, ganymede1
+ allow from 129.175.22.65
+ # field
+ allow from 194.177.211.210
+ # luchesi
+ # Password based due to being KVM instance
+ # allow from 137.82.84.78
+# 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
+ </DirectoryMatch>
+
+ CustomLog /var/log/apache2/incoming-access.log combined
+ ErrorLog /var/log/apache2/incoming-error.log
+
+</VirtualHost>
--
1.7.1
Reply to: