X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fpopcon%2Fpopcon.debian.org.conf;h=8c05084fe27a9ac382c75aefc068994c4f1a7fb1;hb=13ed05f0053a0a93ac099af3446d6d1594bb65b0;hp=c589861bc94a26f7b9f977fc66a270037d69fded;hpb=38e8fb687f0cb0f66d5a58d42e1f706b9d4c42e1;p=mirror%2Fdsa-puppet.git
diff --git a/modules/roles/files/popcon/popcon.debian.org.conf b/modules/roles/files/popcon/popcon.debian.org.conf
index c589861bc..8c05084fe 100644
--- a/modules/roles/files/popcon/popcon.debian.org.conf
+++ b/modules/roles/files/popcon/popcon.debian.org.conf
@@ -6,39 +6,16 @@
ErrorLog /var/log/apache2/popcon.debian.org-error.log
CustomLog /var/log/apache2/popcon.debian.org-access.log privacy
- DocumentRoot /srv/popcon.debian.org/www
-
- Require all granted
-
-
- AddDefaultCharset utf-8
ScriptAlias /cgi-bin /srv/popcon.debian.org/cgi-bin/
- Require all granted
+
+ Require all granted
+
RewriteEngine on
- RewriteRule ^/src:([-a-z+.0-9]+)$ https://qa.debian.org/developer.php?popcon=$1 [R,L]
-
RewriteCond "%{HTTP_USER_AGENT}" !popcon-upload
RewriteRule ^(.*) https://popcon.debian.org$1 [R,L]
-
- #UserDir public_popcon
- #
- # AddOutputFilterByType DEFLATE text/html text/xml
- #
-
- #
- #
- # Options +MultiViews
- #
- # AddHandler fcgid-script .php
- # FCGIWrapper /usr/lib/cgi-bin/php5 .php
- #
- # Options ExecCGI
- #
- #
- #
@@ -47,7 +24,7 @@
ServerAdmin popcon-developers@lists.alioth.debian.org
Use common-debian-service-ssl popcon.debian.org
-# Use common-ssl-HSTS
+ Use common-ssl-HSTS
Use http-pkp-popcon.debian.org
ErrorLog /var/log/apache2/popcon.debian.org-error.log