infrastructure/ansible
2
0
Fork 0
Code Pull requests 7 Activity Actions

waiverdb role: fix the settings.py template

Browse source
This commit is contained in:
Matt Jia 2017-05-17 13:09:23 +10:00
parent 6da940f3fd
commit 2adc74f3d5
No known key found for this signature in database
GPG key ID: 496C2CDC1EF01F5D
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/host_vars/waiverdb-dev.fedorainfracloud.org
View file

@ -12,6 +12,7 @@ hostbase: waverdb-dev
public_ip: 209.132.184.51 public_ip: 209.132.184.51
root_auth_users: mjia root_auth_users: mjia
description: waverdb development instance description: waverdb development instance
deployment_type: dev
cloud_networks: cloud_networks:
# persistent-net # persistent-net

8
roles/waiverdb/templates/etc/waiverdb/settings.py.j2
View file

@ -1,6 +1,6 @@
{% if env == "production" %} {% if deployment_type == "prod" %}
SECRET_KEY = '{{ prod_waiverdb_secret_key }}' SECRET_KEY = '{{ prod_waiverdb_secret_key }}'
{% elif env == "staging" %} {% elif deployment_type == "stg" %}
SECRET_KEY = '{{ stg_waiverdb_secret_key }}' SECRET_KEY = '{{ stg_waiverdb_secret_key }}'
{% else %} {% else %}
SECRET_KEY = '{{ dev_waiverdb_secret_key }}' SECRET_KEY = '{{ dev_waiverdb_secret_key }}'
@ -9,8 +9,6 @@ SQLALCHEMY_DATABASE_URI = 'postgresql://waiverdb-user@:{{ waiverdb_db_port }}/wa
OIDC_CLIENT_SECRETS = '/etc/waiverdb/client_secrets.json' OIDC_CLIENT_SECRETS = '/etc/waiverdb/client_secrets.json'
OIDC_REQUIRED_SCOPE = 'https://waiverdb.fedoraproject.org/oidc/create-waiver' OIDC_REQUIRED_SCOPE = 'https://waiverdb.fedoraproject.org/oidc/create-waiver'
OIDC_RESOURCE_SERVER_ONLY = True OIDC_RESOURCE_SERVER_ONLY = True
{% if env == "production" or env == "staging" %} {% if deployment_type == "dev" %}
ZEROMQ_PUBLISH = True
{% else %}
ZEROMQ_PUBLISH = False ZEROMQ_PUBLISH = False
{% endif %} {% endif %}