From 6e606f668498e3374f5426c8fc216c348d318092 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 7 Jun 2013 22:02:23 +0000 Subject: [PATCH] Fun with templates --- files/fedmsg/base.py.j2 | 2 +- files/fedmsg/endpoints.py.j2 | 4 ++-- files/fedmsg/pkgdb.py.j2 | 4 ++-- files/fedmsg/relay.py.j2 | 2 +- files/fedmsg/ssl.py.j2 | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/files/fedmsg/base.py.j2 b/files/fedmsg/base.py.j2 index 489c93b006..cab02ff1b2 100644 --- a/files/fedmsg/base.py.j2 +++ b/files/fedmsg/base.py.j2 @@ -2,7 +2,7 @@ config = dict( # Set this to dev if you're hacking on fedmsg or an app locally. # Set to stg or prod if running in the Fedora Infrastructure. - {% if environment == 'staging' %} + {% if environment equals 'staging' %} environment="stg", {% else %} environment="prod", diff --git a/files/fedmsg/endpoints.py.j2 b/files/fedmsg/endpoints.py.j2 index 0af2d286c8..33755878d2 100644 --- a/files/fedmsg/endpoints.py.j2 +++ b/files/fedmsg/endpoints.py.j2 @@ -1,4 +1,4 @@ -{% if environment == 'staging' %} +{% if environment equals 'staging' %} suffix = 'stg.phx2.fedoraproject.org' non_phx_suffix = 'stg.fedoraproject.org' {% else %} @@ -28,7 +28,7 @@ config = dict( "tcp://releng01.%s:3000" % suffix, "tcp://releng01.%s:3001" % suffix, ], -{% if environment != 'staging' %} +{% if not environment equals 'staging' %} "bodhi.app03": [ "tcp://app03.%s:300%i" % (suffix, i) for i in range(8) diff --git a/files/fedmsg/pkgdb.py.j2 b/files/fedmsg/pkgdb.py.j2 index 3e7f068fcc..75849ad8ba 100644 --- a/files/fedmsg/pkgdb.py.j2 +++ b/files/fedmsg/pkgdb.py.j2 @@ -1,4 +1,4 @@ -{% if environment == 'staging' %} +{% if environment equals 'staging' %} suffix = 'stg.phx2.fedoraproject.org' non_phx_suffix = 'stg.fedoraproject.org' {% else %} @@ -16,7 +16,7 @@ config = dict( "tcp://app02.%s:301%i" % (suffix, i) for i in range(6) ], -{% if environment != 'staging' %} +{% if not environment equals 'staging' %} "pkgdb.app03": [ "tcp://app03.%s:301%i" % (suffix, i) for i in range(6) diff --git a/files/fedmsg/relay.py.j2 b/files/fedmsg/relay.py.j2 index 5266e77e41..43cb596c95 100644 --- a/files/fedmsg/relay.py.j2 +++ b/files/fedmsg/relay.py.j2 @@ -1,4 +1,4 @@ -{% if environment == 'staging' %} +{% if environment equals 'staging' %} suffix = 'stg.phx2.fedoraproject.org' non_phx_suffix = 'stg.fedoraproject.org' {% else %} diff --git a/files/fedmsg/ssl.py.j2 b/files/fedmsg/ssl.py.j2 index 2992409eda..9e52f7b2c4 100644 --- a/files/fedmsg/ssl.py.j2 +++ b/files/fedmsg/ssl.py.j2 @@ -1,5 +1,5 @@ -{% if environment = 'staging' %} +{% if environment equals 'staging' %} suffix = "stg.phx2.fedoraproject.org" app_hosts = [ "app01.stg.phx2.fedoraproject.org",