From 0cb68445f4fa0a97213a2d71a672e4e990e1b4e8 Mon Sep 17 00:00:00 2001
From: Luke Macken <lmacken@redhat.com>
Date: Thu, 20 Feb 2014 21:32:25 +0000
Subject: [PATCH] s/environment/env in the bodhi-prod.cfg.j2 template

---
 roles/bodhi/base/templates/bodhi-prod.cfg.j2 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/roles/bodhi/base/templates/bodhi-prod.cfg.j2 b/roles/bodhi/base/templates/bodhi-prod.cfg.j2
index 11bde0bcdd..de782f3ad5 100644
--- a/roles/bodhi/base/templates/bodhi-prod.cfg.j2
+++ b/roles/bodhi/base/templates/bodhi-prod.cfg.j2
@@ -40,17 +40,17 @@ f21.pre_beta.critpath.min_karma = 1
 #newupdate_notice = 'Koji is currently down for a scheduled outage. Please see <a href="http://status.fedoraproject.org/">status.fedoraproject.org</a> for more information'
 
 # Query the Fedora Package Database for the list of Critical Path Packages.
-{% if environment == "production" %}
+{% if env == "production" %}
 critpath.type = 'pkgdb'
 {% endif %}
 
-{% if environment == "production" %}
+{% if env == "production" %}
 deployment_type = "prod"
 {% endif %}
-{% if environment == "staging" %}
+{% if env == "staging" %}
 deployment_type = "stg"
 {% endif %}
-{% if environment == "development" %}
+{% if env == "development" %}
 deployment_type = "dev"
 {% endif %}
 
@@ -84,7 +84,7 @@ server.socket_queue_size = 30
 session_filter.on = False
 base_url_filter.on = True
 base_url_filter.use_x_forwarded_host = False
-{% if environment == "staging" %}
+{% if env == "staging" %}
 base_url_filter.base_url = 'https://admin.stg.fedoraproject.org'
 {% else %}
 base_url_filter.base_url = 'https://admin.fedoraproject.org'
@@ -115,7 +115,7 @@ fedora_announce_list = 'package-announce@lists.fedoraproject.org'
 fedora_test_announce_list = 'test@lists.fedoraproject.org'
 mashed_dir = '/mnt/koji/mash/updates'
 # TurboMail 3.0 settings
-{% if environment == "staging" %}
+{% if env == "staging" %}
 mail.on = False
 {% else %}
 mail.on = True
@@ -132,20 +132,20 @@ bz_cookie = '/var/tmp/bodhi-bz.cookie'
 bz_products = 'Fedora,Fedora EPEL,oVirt'
 
 build_dir = '/mnt/koji/packages'
-{% if environment == "staging" %}
+{% if env == "staging" %}
 base_address = 'https://admin.stg.fedoraproject.org'
 {% else %}
 base_address = 'https://admin.fedoraproject.org'
 {% endif %}
 
 acl_system = 'pkgdb'
-{% if environment == "staging" %}
+{% if env == "staging" %}
 pkgdb_url = 'http://localhost/pkgdb'
 {% else %}
 pkgdb_url = 'https://admin.fedoraproject.org/pkgdb'
 {% endif %}
 
-{% if environment == "staging" %}
+{% if env == "staging" %}
 buildsystem = 'dev'
 {% else %}
 buildsystem = 'koji'