From bfaf5a59bff17bcbf4ba4fc8c8fd62c100b5fa5b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 19 Sep 2022 14:11:50 -0700 Subject: [PATCH] elections: seperate prod and stg passwords Signed-off-by: Kevin Fenzi --- roles/openshift-apps/elections/templates/alembic.ini | 2 +- roles/openshift-apps/elections/templates/fedora-elections.cfg | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/openshift-apps/elections/templates/alembic.ini b/roles/openshift-apps/elections/templates/alembic.ini index 723b72e30a..c7a520c367 100644 --- a/roles/openshift-apps/elections/templates/alembic.ini +++ b/roles/openshift-apps/elections/templates/alembic.ini @@ -12,7 +12,7 @@ script_location = /opt/app-root/src/alembic # revision_environment = false {% if env == 'staging' %} -sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01.stg.iad2.fedoraproject.org/{{ elections_db_name }} +sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_stg_db_pass }}@db01.stg.iad2.fedoraproject.org/{{ elections_db_name }} {% else %} sqlalchemy.url = postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01.iad2.fedoraproject.org/{{ elections_db_name }} {% endif %} diff --git a/roles/openshift-apps/elections/templates/fedora-elections.cfg b/roles/openshift-apps/elections/templates/fedora-elections.cfg index 4364d424c1..7b02830bd5 100644 --- a/roles/openshift-apps/elections/templates/fedora-elections.cfg +++ b/roles/openshift-apps/elections/templates/fedora-elections.cfg @@ -9,7 +9,11 @@ SECRET_KEY='{{ elections_secret_key }}' APPLICATION_ROOT = '/' ### url to the database server: +{% if env == 'staging' %} +DB_URL='postgresql://{{ elections_db_user }}:{{ elections_stg_db_pass }}@db01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org/{{ elections_db_name }}' +{% else %} DB_URL='postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org/{{ elections_db_name }}' +{% endif %} ## One ore more FAS group that will have admin rights over the whole ## application, including all elections past, present and future