X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fdebconf_wafer%2Fwafertest.debconf.org;h=760953b1daa61d63331fa703461aff8f4577d11c;hb=5c60e49a96fe718a8bb84c957c1715184ee65749;hp=f94f87b4038154fa95b8a9049704c85f7184d97e;hpb=8575b4449e5ceefa8a865b406b7accf56449b97f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/debconf_wafer/wafertest.debconf.org b/modules/roles/files/debconf_wafer/wafertest.debconf.org
index f94f87b40..760953b1d 100644
--- a/modules/roles/files/debconf_wafer/wafertest.debconf.org
+++ b/modules/roles/files/debconf_wafer/wafertest.debconf.org
@@ -1,3 +1,5 @@
+# do not modify - this file is maintained via puppet
+
 AddType application/font-woff2 .woff2
 
 Use common-debian-service-https-redirect * wafertest.debconf.org
@@ -5,7 +7,7 @@ Use common-debian-service-https-redirect * wafertest.debconf.org
 WSGIDaemonProcess wafertest \
   processes=3 threads=2 \
   user=www-data group=debconf-web maximum-requests=750 umask=0007 display-name=wsgi-wafertest.debconf.org \
-  python-path=/srv/debconf-web/wafertest.debconf.org/dc18.dc.o/:/srv/debconf-web/wafertest.debconf.org/dc18.dc.o/ve/lib/python3.5/site-packages/
+  python-path=/srv/debconf-web/wafertest.debconf.org/dc20/:/srv/debconf-web/wafertest.debconf.org/dc20/ve/lib/python3.5/site-packages/
 
 <VirtualHost *:443>
   ServerAdmin admin@debconf.org
@@ -28,16 +30,18 @@ WSGIDaemonProcess wafertest \
   SSLCARevocationFile /var/lib/dsa/sso/ca.crl
 
   WSGIProcessGroup wafertest
-  WSGIScriptAlias / /srv/debconf-web/wafertest.debconf.org/dc18.dc.o/wsgi.py
-  <Directory /srv/debconf-web/wafertest.debconf.org/dc18.dc.o>
+  WSGIScriptAlias / /srv/debconf-web/wafertest.debconf.org/dc20/wsgi.py
+  WSGIPassAuthorization On
+
+  <Directory /srv/debconf-web/wafertest.debconf.org/dc20>
     <Files wsgi.py>
       Require all granted
     </Files>
   </Directory>
 
-  Alias /static/ /srv/debconf-web/wafertest.debconf.org/dc18.dc.o/localstatic/
-  Alias /favicon.ico /srv/debconf-web/wafertest.debconf.org/dc18.dc.o/localstatic/img/favicon/favicon.ico
-  <Directory /srv/debconf-web/wafertest.debconf.org/dc18.dc.o/localstatic/>
+  Alias /static/ /srv/debconf-web/wafertest.debconf.org/dc20/localstatic/
+  Alias /favicon.ico /srv/debconf-web/wafertest.debconf.org/dc20/localstatic/img/favicon/favicon.ico
+  <Directory /srv/debconf-web/wafertest.debconf.org/dc20/localstatic/>
     Require all granted
 
     # A little hacky, but it means we won't accidentally catch non-hashed filenames
@@ -47,8 +51,8 @@ WSGIDaemonProcess wafertest \
     </FilesMatch>
   </Directory>
 
-  Alias /media/ /srv/debconf-web/wafertest.debconf.org/dc18.dc.o/media/
-  <Directory /srv/debconf-web/wafertest.debconf.org/dc18.dc.o/media/>
+  Alias /media/ /srv/debconf-web/wafertest.debconf.org/dc20/media/
+  <Directory /srv/debconf-web/wafertest.debconf.org/dc20/media/>
     Require all granted
   </Directory>