summaryrefslogtreecommitdiffstats
path: root/roles/taskotron/execdb
diff options
context:
space:
mode:
authorTim Flink <tflink@fedoraproject.org>2015-10-05 15:40:47 +0000
committerTim Flink <tflink@fedoraproject.org>2015-10-05 15:40:47 +0000
commitf282de1c042bf7b3e341e34a930ce7083ff4ee4b (patch)
tree56fad7cc999d5d074f8b823f70c9ef854cac0520 /roles/taskotron/execdb
parent029119e78bad26b0c70c4965b5a9e5a7d735adb6 (diff)
downloadansible-f282de1c042bf7b3e341e34a930ce7083ff4ee4b.tar.gz
ansible-f282de1c042bf7b3e341e34a930ce7083ff4ee4b.tar.xz
ansible-f282de1c042bf7b3e341e34a930ce7083ff4ee4b.zip
adding missing vars to resultsdb-dev, refactoring execdb settings
Diffstat (limited to 'roles/taskotron/execdb')
-rw-r--r--roles/taskotron/execdb/templates/settings.py.j210
1 files changed, 3 insertions, 7 deletions
diff --git a/roles/taskotron/execdb/templates/settings.py.j2 b/roles/taskotron/execdb/templates/settings.py.j2
index 6075840ca..9494fe200 100644
--- a/roles/taskotron/execdb/templates/settings.py.j2
+++ b/roles/taskotron/execdb/templates/settings.py.j2
@@ -6,13 +6,9 @@ SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ prod_execdb_db_user }}:{{ pr
SECRET_KEY = '{{ stg_execdb_secret_key }}'
SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ stg_execdb_db_user }}:{{ stg_execdb_db_password }}@{{ execdb_db_host }}:{{ execdb_db_port }}/{{ execdb_db_name }}'
{% endif %}
-{%- if deployment_type == 'dev' %}
-SECRET_KEY = '{{ dev_execdb_secret_key }}'
-SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ dev_execdb_db_user }}:{{ dev_execdb_db_password }}@{{ execdb_db_host }}:{{ execdb_db_port }}/{{ execdb_db_name }}'
-{% endif %}
-{%- if deployment_type == 'local' %}
-SECRET_KEY = '{{ local_execdb_secret_key }}'
-SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ local_execdb_db_user }}:{{ local_execdb_db_password }}@127.0.0.1:{{ execdb_db_port }}/{{ execdb_db_name }}'
+{%- if deployment_type == 'dev' or deployment_type == 'local' %}
+SECRET_KEY = '{{ execdb_secret_key }}'
+SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ execdb_db_user }}:{{ execdb_db_password }}@{{ execdb_db_host }}:{{ execdb_db_port }}/{{ execdb_db_name }}'
{% endif %}
FILE_LOGGING = False
LOGFILR = '/var/log/execdb/execdb.log'