X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fdebtags%2Fdebtags.debian.org;h=d8437459f73cac5b0d7373e1a270b306e7509143;hb=cff9b0af551b6d72330c17cc4e81e44c6b2dd03f;hp=234fe42b0059afc6d825eceaad5ecb49ed443533;hpb=39d8d3a50f936d12c16b9eb4e3726cccd132145f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/debtags/debtags.debian.org b/modules/roles/files/debtags/debtags.debian.org
index 234fe42b0..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
@@ -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>