Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix these conditionals. We don't use environment, but env

Browse source
This commit is contained in:
Kevin Fenzi 2016-03-05 20:18:54 +00:00
parent 750ed8f464
commit 48a39ba4c0
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
roles/datagrepper/templates/datagrepper.cfg
View file

@ -6,27 +6,27 @@ SECRET_KEY = '{{ datagrepperCookieSecret }}'
### Unhappy mako
MAKO_OUTPUT_ENCODING='utf-8'
{% if environment == "staging" %}
{% if env == "staging" %}
DATAGREPPER_BASE_URL='https://apps.stg.fedoraproject.org/datagrepper/'
{% else %}
DATAGREPPER_BASE_URL='https://apps.fedoraproject.org/datagrepper/'
{% endif %}
DATAGREPPER_CACHE_BACKEND='dogpile.cache.memcached'
{% if environment == "staging" %}
{% if env == "staging" %}
DATAGREPPER_CACHE_KWARGS={'arguments': {'url': 'memcached01:11211'}}
{% else %}
#DATAGREPPER_CACHE_KWARGS={'arguments': {'url': ['memcached01.phx2.fedoraproject.org:11211', 'memcached02.phx2.fedoraproject.org:11211']}}
DATAGREPPER_CACHE_KWARGS={'arguments': {'url': ['memcached01.phx2.fedoraproject.org:11211']}}
{% endif %}
{% if environment == "staging" %}
{% if env == "staging" %}
SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ datagrepper_app_user }}:{{ datagrepper_app_password }}@db01.stg.phx2.fedoraproject.org:5432/datagrepper'
{% else %}
SQLALCHEMY_DATABASE_URI='postgresql+psycopg2://{{ datagrepper_app_user }}:{{ datagrepper_app_password }}@db01.phx2.fedoraproject.org:5432/datagrepper'
{% endif %}
{% if environment == "staging" %}
{% if env == "staging" %}
DATAGREPPER_OPENID_ENDPOINT='id.stg.fedoraproject.org'
{% else %}
DATAGREPPER_OPENID_ENDPOINT='id.fedoraproject.org'
@ -34,5 +34,5 @@ DATAGREPPER_OPENID_ENDPOINT='id.fedoraproject.org'
RUNNER_LOCKFILE='/var/run/fedmsg/datagrepper.lock'
JOB_OUTPUT_DIR='/var/cache/datagrepper'
JOB_OUTPUT_URL='https://apps.{% if environment == "staging" %}stg.{% endif %}fedoraproject.org/datagrepper/output'
JOB_OUTPUT_URL='https://apps.{% if env == "staging" %}stg.{% endif %}fedoraproject.org/datagrepper/output'
JOB_EXPIRY=timedelta(days=7)