From 905f32a0e89a24089cc49b36470e01e426139cfe Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mon, 20 May 2019 20:58:23 +0200 Subject: [PATCH] elections: fix the path to the database and in the cookie The path to the database did not open correctly the jinja variable. The application_root is used in the cookie, and now that elections is running at the root of the URL, it must reflect that. Signed-off-by: Pierre-Yves Chibon --- .../elections/templates/fedora-elections.cfg | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/roles/openshift-apps/elections/templates/fedora-elections.cfg b/roles/openshift-apps/elections/templates/fedora-elections.cfg index 58773ffde9..ae7b55869a 100644 --- a/roles/openshift-apps/elections/templates/fedora-elections.cfg +++ b/roles/openshift-apps/elections/templates/fedora-elections.cfg @@ -5,15 +5,14 @@ import os ### Secret key for the Flask application SECRET_KEY='{{ elections_secret_key }}' -### url to the database server: -{% if env == 'staging' %} # Used by SESSION_COOKIE_PATH APPLICATION_ROOT = '/' + +### url to the database server: +{% if env == 'staging' %} DB_URL='postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01.stg.phx2.fedoraproject.org/{{ elections_db_name }}' {% else %} -# Used by SESSION_COOKIE_PATH -APPLICATION_ROOT = '/voting/' -DB_URL='postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01.phx2.fedoraproject.org/elections_db_name }}' +DB_URL='postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01.phx2.fedoraproject.org/{{ elections_db_name }}' {% endif %} ## One ore more FAS group that will have admin rights over the whole