Commit 5e460931 authored by Ansgar's avatar Ansgar

config/debian-security: update apache2.conf

parent 1f5bcbdd
......@@ -8,38 +8,16 @@ BrowserMatch EmailSiphon spammer
ServerAdmin team@security.debian.org
DocumentRoot /srv/security-master.debian.org/htdocs-security-master
<Directory /srv/security-master.debian.org/htdocs-security-master>
Require all granted
</Directory>
ErrorLog /var/log/apache2/security-master.debian.org-error.log
CustomLog /var/log/apache2/security-master.debian.org-access.log combined
LogLevel warn
Alias /debian-security /srv/security.debian.org/archive/debian-security/
Alias /debian-security-buildd /srv/security-master.debian.org/buildd/debian-security-buildd/
Alias /buildd/ /srv/security-master.debian.org/buildd/
<LocationMatch "^/(buildd|buildd-squeeze|buildd-wheezy|debian-security|debian-security-buildd)/">
order deny,allow
deny from all
Use DebianBuilddHostList
# spohr.debian.org - not in list of buildds generated by puppet
allow from 192.25.206.33
# whitelisted for Joerg Jaspert
allow from 78.46.40.15
allow from 2001:4dd0:ff00:df::2
allow from 213.146.108.162
allow from 2a01:198:5d0:0:21c:c0ff:fead:e3a3
AuthName "security.debian.org"
AuthType Basic
AuthUserFile /srv/security-master.debian.org/apache.htpasswd
require valid-user
# either valid IP address or valid user are sufficient
satisfy any
</LocationMatch>
RewriteEngine on
RewriteRule ^/$ https://www.debian.org/security/
</Macro>
<VirtualHost *:80>
......@@ -51,5 +29,25 @@ BrowserMatch EmailSiphon spammer
Use SecurityMasterConfiguration
Use common-debian-service-ssl security-master.debian.org
Use common-ssl-HSTS
Use http-pkp-security-master.debian.org
Alias /debian-security /srv/security.debian.org/archive/debian-security/
Alias /debian-security-buildd /srv/security-master.debian.org/buildd/debian-security-buildd/
<LocationMatch "^/(debian-security|debian-security-buildd)/">
Use DebianBuilddHostList
# whitelisted for Joerg Jaspert
Require ip 78.46.40.15
Require ip 2001:4dd0:ff00:df::2
Require ip 213.146.108.162
Require ip 2a01:198:5d0:0:21c:c0ff:fead:e3a3
# AuthName "security.debian.org"
# AuthType Basic
# AuthUserFile /srv/security-master.debian.org/apache.htpasswd
# Require valid-user
</LocationMatch>
</VirtualHost>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment