X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fdebconf_wafer%2Fwafertest.debconf.org;h=760953b1daa61d63331fa703461aff8f4577d11c;hb=f2c0ff27cd31263a2ccce2eaac2791ba645f8d69;hp=8e330009f0dc4e3f4271cbc0a360c260b4aa96bd;hpb=63cf2cb51b3fed90e8f7ea5218d07b244aeee62c;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 8e330009f..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,18 +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
+  WSGIScriptAlias / /srv/debconf-web/wafertest.debconf.org/dc20/wsgi.py
   WSGIPassAuthorization On
 
-  <Directory /srv/debconf-web/wafertest.debconf.org/dc18.dc.o>
+  <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
@@ -49,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>