From: Luca Filipozzi <luca.filipozzi@gmail.com>
Date: Mon, 6 Aug 2018 07:20:52 +0000 (-0700)
Subject: action RT#7389 - debconf19.debconf.org setup
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=22f4641ad392e989429a11238ec5a6a90eb3b5ac;hp=a8004e61dd75597295a5ff1b2e2ec5cda01538bf;p=mirror%2Fdsa-puppet.git

action RT#7389 - debconf19.debconf.org setup

Signed-off-by: Luca Filipozzi <luca.filipozzi@gmail.com>
---

diff --git a/modules/roles/files/debconf_wafer/wafertest.debconf.org b/modules/roles/files/debconf_wafer/wafertest.debconf.org
index 8e330009f..6b8219f5e 100644
--- a/modules/roles/files/debconf_wafer/wafertest.debconf.org
+++ b/modules/roles/files/debconf_wafer/wafertest.debconf.org
@@ -5,7 +5,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/dc19/:/srv/debconf-web/wafertest.debconf.org/dc19/ve/lib/python3.5/site-packages/
 
 <VirtualHost *:443>
   ServerAdmin admin@debconf.org
@@ -28,18 +28,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/dc19/wsgi.py
   WSGIPassAuthorization On
 
-  <Directory /srv/debconf-web/wafertest.debconf.org/dc18.dc.o>
+  <Directory /srv/debconf-web/wafertest.debconf.org/dc19>
     <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/dc19/localstatic/
+  Alias /favicon.ico /srv/debconf-web/wafertest.debconf.org/dc19/localstatic/img/favicon/favicon.ico
+  <Directory /srv/debconf-web/wafertest.debconf.org/dc19/localstatic/>
     Require all granted
 
     # A little hacky, but it means we won't accidentally catch non-hashed filenames
@@ -49,8 +49,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/dc19/media/
+  <Directory /srv/debconf-web/wafertest.debconf.org/dc19/media/>
     Require all granted
   </Directory>