X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fdebtags%2Fdebtags.debian.org;h=eb8fcf35c2cec5d0e2b36708dc0ffe79d72af7dc;hb=e4588b11bfd3d7c536de20a19552732a4d6c51f7;hp=67d009050d7d54cdba3099c13ad59b9543f35d9b;hpb=73898a88dbf0245dc94c3f8decac8ccbb7546391;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/debtags/debtags.debian.org b/modules/roles/files/debtags/debtags.debian.org
index 67d009050..eb8fcf35c 100644
--- a/modules/roles/files/debtags/debtags.debian.org
+++ b/modules/roles/files/debtags/debtags.debian.org
@@ -1,43 +1,56 @@
 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
 
 <VirtualHost *:443>
-	ServerName debtags.debian.org
-	ServerAdmin debian-admin@lists.debian.org
-
-	Use common-debian-service-ssl debtags.debian.org
-	Use common-ssl-HSTS
-
-	SSLCACertificateFile /var/lib/dsa/sso/ca.crt
-	SSLCARevocationCheck chain
-	SSLCARevocationFile /var/lib/dsa/sso/ca.crl
-	SSLVerifyClient optional
-
-	SSLOptions +StdEnvVars
-
-	<IfModule mod_userdir.c>
-		UserDir disabled
-	</IfModule>
-	ErrorLog /var/log/apache2/debtags.debian.org-error.log
-	CustomLog /var/log/apache2/debtags.debian.org-access.log privacy
-	ServerSignature On
-
-
-	<Directory /srv/debtags.debian.org/htdocs>
-		Require all granted
-	</Directory>
-	Alias /static/ /srv/debtags.debian.org/htdocs/
-
-	<Directory /srv/debtags.debian.org/debtagsd/debtagsd>
-		<Files wsgi.py>
-			Require all granted
-		</Files>
-		WSGIScriptReloading On
-	</Directory>
-
-	WSGIScriptAlias / /srv/debtags.debian.org/debtagsd/debtagsd/wsgi.py
-	WSGIProcessGroup debtags.debian.org
-	WSGIPassAuthorization On
+    ServerName debtags.debian.org
+    ServerAdmin debian-admin@lists.debian.org
+
+    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
+    SSLCARevocationFile /var/lib/dsa/sso/ca.crl
+    SSLVerifyClient optional
+
+    SSLOptions +StdEnvVars
+
+    <IfModule mod_userdir.c>
+        UserDir disabled
+    </IfModule>
+    ErrorLog /var/log/apache2/debtags.debian.org-error.log
+    CustomLog /var/log/apache2/debtags.debian.org-access.log privacy
+    ServerSignature On
+
+
+    <Directory /srv/debtags.debian.org/htdocs>
+        Require all granted
+    </Directory>
+    Alias /static/ /srv/debtags.debian.org/htdocs/
+
+    <Directory /srv/debtags.debian.org/debtagsd/debtagsd>
+        <Files wsgi.py>
+            Require all granted
+        </Files>
+    </Directory>
+
+    WSGIScriptAlias / /srv/debtags.debian.org/debtagsd/debtagsd/wsgi.py
+    WSGIProcessGroup debtags.debian.org
+    WSGIPassAuthorization On
+
+    Header always set Referrer-Policy "same-origin"
 </VirtualHost>
 
+# vim: syntax=apache ts=4 sw=4 sts=4 sr et