X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fdebtags%2Fdebtags.debian.org;h=00ee1c72a25ab20dafc94f3f99a4f22d341c182f;hb=4e95e6f4d2918b5c72c106fac3b29789dcb4101f;hp=aba7496c301534f6bb992ea2a1a3c148d663cbe7;hpb=47ef30bef77893865ca0d1a852d5a79b02d78eee;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/debtags/debtags.debian.org b/modules/roles/files/debtags/debtags.debian.org
index aba7496c3..00ee1c72a 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
 
@@ -24,18 +34,19 @@ WSGIDaemonProcess debtags.debian.org user=nobody group=debtags home=/ processes=
 	ServerSignature On
 
 
-	<Directory /srv/debtags.debian.net/htdocs>
+	<Directory /srv/debtags.debian.org/htdocs>
 		Require all granted
 	</Directory>
+	Alias /static/ /srv/debtags.debian.org/htdocs/
 
-	<Directory /srv/debtags.debian.net/bin>
-		<Files debtags.wsgi>
+	<Directory /srv/debtags.debian.org/debtagsd/debtagsd>
+		<Files wsgi.py>
 			Require all granted
 		</Files>
 	</Directory>
 
-	WSGIScriptAlias / /srv/debtags.debian.net/bin/debtags.wsgi
-	WSGIProcessGroup debtags.debian.net
+	WSGIScriptAlias / /srv/debtags.debian.org/debtagsd/debtagsd/wsgi.py
+	WSGIProcessGroup debtags.debian.org
 	WSGIPassAuthorization On
 </VirtualHost>