Remove unneeded bits from the http popcon vhost, and enable HSTS

diff --git a/modules/roles/files/popcon/popcon.debian.org.conf b/modules/roles/files/popcon/popcon.debian.org.conf
index c589861..41fc1ef 100644 (file)
--- a/modules/roles/files/popcon/popcon.debian.org.conf
+++ b/modules/roles/files/popcon/popcon.debian.org.conf
@@ -6,39 +6,14 @@
        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
-       <Directory /srv/popcon.debian.org/www>
-               Require all granted
-       </Directory>
-
-       AddDefaultCharset utf-8
        ScriptAlias /cgi-bin /srv/popcon.debian.org/cgi-bin/
        <Directory /srv/popcon.debian.org/cgi-bin>
                Require all granted
        </Directory>
 
        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
-       #<IfModule mod_deflate.c>
-       #   AddOutputFilterByType DEFLATE text/html text/xml
-       #</IfModule>
-
-       #<IfModule mod_fcgid.c>
-       #       <Directory /home/*/public_popcon>
-       #               Options +MultiViews
-       #
-       #               AddHandler fcgid-script .php
-       #               FCGIWrapper /usr/lib/cgi-bin/php5 .php
-       #               <Files *.php>
-       #                       Options ExecCGI
-       #               </Files>
-       #       </Directory>
-       #</IfModule>
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -47,7 +22,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