HPKP for debtags

[mirror/dsa-puppet.git] / modules / roles / files / debtags / debtags.debian.org

diff --git a/modules/roles/files/debtags/debtags.debian.org b/modules/roles/files/debtags/debtags.debian.org
index 234fe42..d843745 100644 (file)
--- a/modules/roles/files/debtags/debtags.debian.org
+++ b/modules/roles/files/debtags/debtags.debian.org
@@ -1,4 +1,14 @@
 Use common-debian-service-https-redirect * debtags.debian.org
+<VirtualHost *:80>
+  ServerName debtags.debian.net
+  ServerAdmin debian-admin@lists.debian.org
+
+  CustomLog /var/log/apache2/debtags.debian.org-access.log privacy
+  ErrorLog /var/log/apache2/debtags.debian.org-error.log
+
+  Redirect permanent / https://debtags.debian.org/
+</VirtualHost>
+
 
 WSGIDaemonProcess debtags.debian.org user=nobody group=debtags home=/ processes=2 threads=5 maximum-requests=5000 inactivity-timeout=1800 umask=0077 display-name=wsgi-debtags.debian.org
 
@@ -8,6 +18,7 @@ WSGIDaemonProcess debtags.debian.org user=nobody group=debtags home=/ processes=
 
        Use common-debian-service-ssl debtags.debian.org
        Use common-ssl-HSTS
+       Use http-pkp-debtags.debian.org
 
        SSLCACertificateFile /var/lib/dsa/sso/ca.crt
        SSLCARevocationCheck chain
@@ -27,14 +38,15 @@ WSGIDaemonProcess debtags.debian.org user=nobody group=debtags home=/ processes=
        <Directory /srv/debtags.debian.org/htdocs>
                Require all granted
        </Directory>
+       Alias /static/ /srv/debtags.debian.org/htdocs/
 
-       <Directory /srv/debtags.debian.org/bin>
-               <Files debtags.wsgi>
+       <Directory /srv/debtags.debian.org/debtagsd/debtagsd>
+               <Files wsgi.py>
                        Require all granted
                </Files>
        </Directory>
 
-       WSGIScriptAlias / /srv/debtags.debian.org/bin/debtags.wsgi
+       WSGIScriptAlias / /srv/debtags.debian.org/debtagsd/debtagsd/wsgi.py
        WSGIProcessGroup debtags.debian.org
        WSGIPassAuthorization On
 </VirtualHost>