From 48a39ba4c06e4a3e954d9bc6110665dd9ac51e4a Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 5 Mar 2016 20:18:54 +0000
Subject: [PATCH] Fix these conditionals. We don't use environment, but env

---
 roles/datagrepper/templates/datagrepper.cfg | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/roles/datagrepper/templates/datagrepper.cfg b/roles/datagrepper/templates/datagrepper.cfg
index 83b3ca357f..348f10e0de 100644
--- a/roles/datagrepper/templates/datagrepper.cfg
+++ b/roles/datagrepper/templates/datagrepper.cfg
@@ -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)