From f46a6c8f2a6c5eb9dbee7c1f406666dd4e1cbb1c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 19 Sep 2022 13:06:26 -0700 Subject: [PATCH] nuancier: split out prod and stg access/passwords. Currently both prod and stg were using the same credentials. Move to using different for each. Signed-off-by: Kevin Fenzi --- roles/nuancier/templates/alembic.ini | 4 ++++ roles/nuancier/templates/nuancier.cfg | 8 ++++++++ roles/nuancier/templates/nuancier_admin.cfg | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/roles/nuancier/templates/alembic.ini b/roles/nuancier/templates/alembic.ini index 5ac41c9c68..8e42cac181 100644 --- a/roles/nuancier/templates/alembic.ini +++ b/roles/nuancier/templates/alembic.ini @@ -11,7 +11,11 @@ script_location = /usr/share/nuancier/alembic # the 'revision' command, regardless of autogenerate # revision_environment = false +{% if env == "staging" %} +sqlalchemy.url = postgresql://{{ nuancier_stg_db_admin_user }}:{{ nuancier_stg_db_admin_pass }}@{{ nuancier_stg_db_host }}/{{ nuancier_stg_db_name }} +{% else %} sqlalchemy.url = postgresql://{{ nuancier_db_admin_user }}:{{ nuancier_db_admin_pass }}@{{ nuancier_db_host }}/{{ nuancier_db_name }} +{% endif %} # Logging configuration diff --git a/roles/nuancier/templates/nuancier.cfg b/roles/nuancier/templates/nuancier.cfg index c128e3c5aa..22f436e009 100644 --- a/roles/nuancier/templates/nuancier.cfg +++ b/roles/nuancier/templates/nuancier.cfg @@ -3,10 +3,18 @@ import os ### Secret key for the Flask application +{% if env == "staging" %} +SECRET_KEY='{{ nuancier_stg_secret_key }}' +{% else %} SECRET_KEY='{{ nuancier_secret_key }}' +{% endif %} ### url to the database server: +{% if env == "staging" %} +DB_URL='postgresql://{{ nuancier_stg_db_user }}:{{ nuancier_stg_db_pass }}@{{ nuancier_stg_db_host }}/{{ nuancier_stg_db_name }}' +{% else %} DB_URL='postgresql://{{ nuancier_db_user }}:{{ nuancier_db_pass }}@{{ nuancier_db_host }}/{{ nuancier_db_name }}' +{% endif %} ### The FAS groups in which the admin of nuancier are ### This can either be a single group or multiple, defined between diff --git a/roles/nuancier/templates/nuancier_admin.cfg b/roles/nuancier/templates/nuancier_admin.cfg index 604c0756df..b208ebf741 100644 --- a/roles/nuancier/templates/nuancier_admin.cfg +++ b/roles/nuancier/templates/nuancier_admin.cfg @@ -3,10 +3,18 @@ import os ### Secret key for the Flask application +{% if env == "staging" %} +SECRET_KEY='{{ nuancier_stg_secret_key }}' +{% else %} SECRET_KEY='{{ nuancier_secret_key }}' +{% endif %} ### url to the database server: +{% if env == "staging" %} +DB_URL='postgresql://{{ nuancier_stg_db_admin_user }}:{{ nuancier_stg_db_admin_pass }}@{{ nuancier_stg_db_host }}/{{ nuancier_stg_db_name }}' +{% else %} DB_URL='postgresql://{{ nuancier_db_admin_user }}:{{ nuancier_db_admin_pass }}@{{ nuancier_db_host }}/{{ nuancier_db_name }}' +{% endif %} ### The FAS groups in which the admin of nuancier are ### This can either be a single group or multiple, defined between