X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fdebtags%2Fdebtags.debian.org;h=d8437459f73cac5b0d7373e1a270b306e7509143;hb=0578c547ab8910fbec58d3c9ac68780d3df316b8;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..d8437459f 100644
--- 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
@@ -33,7 +44,6 @@ WSGIDaemonProcess debtags.debian.org user=nobody group=debtags home=/ processes=
 		<Files wsgi.py>
 			Require all granted
 		</Files>
-		WSGIScriptReloading On
 	</Directory>
 
 	WSGIScriptAlias / /srv/debtags.debian.org/debtagsd/debtagsd/wsgi.py