From dea24de888fa880bcf1b6769c2538c2096c338a6 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 9 Jun 2014 20:10:06 +0000
Subject: [PATCH] Actually fix templates to be jinja2

---
 .../irc/templates/fas-credentials.py.j2       |  2 +-
 roles/fedmsg/irc/templates/ircbot.py.j2       | 30 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/roles/fedmsg/irc/templates/fas-credentials.py.j2 b/roles/fedmsg/irc/templates/fas-credentials.py.j2
index ce141e6831..098962ef87 100644
--- a/roles/fedmsg/irc/templates/fas-credentials.py.j2
+++ b/roles/fedmsg/irc/templates/fas-credentials.py.j2
@@ -1,6 +1,6 @@
 config = dict(
     fas_credentials=dict(
         username="fedoradummy",
-        password="<%= fedoraDummyUserPassword %>",
+        password="{{ fedoraDummyUserPassword }}",
     ),
 )
diff --git a/roles/fedmsg/irc/templates/ircbot.py.j2 b/roles/fedmsg/irc/templates/ircbot.py.j2
index 28cd1692ab..24e9464dae 100644
--- a/roles/fedmsg/irc/templates/ircbot.py.j2
+++ b/roles/fedmsg/irc/templates/ircbot.py.j2
@@ -6,11 +6,11 @@ config = dict(
             make_pretty=True,
             make_terse=True,
 
-            <% if environment == 'staging' %>
+            {% if environment == 'staging' %}
             nickname='fedmsg-stg',
-            <% else %>
+            {% else %}
             nickname='fedmsg-bot',
-            <% end %>
+            {% endif %}
             channel='fedora-fedmsg',
 
             # Ignore some of the koji spamminess
@@ -32,11 +32,11 @@ config = dict(
             make_pretty=True,
             make_terse=True,
 
-            <% if environment == 'staging' %>
+            {% if environment == 'staging' %}
             nickname='fedmsg-ask-stg',
-            <% else %>
+            {% else %}
             nickname='fedmsg-ask',
-            <% end %>
+            {% endif %}
             channel='fedora-ask',
             # Only show AskFedora messages
             filters=dict(
@@ -51,11 +51,11 @@ config = dict(
             make_pretty=True,
             make_terse=True,
 
-            <% if environment == 'staging' %>
+            {% if environment == 'staging' %}
             nickname='fedmsg-releng-s',
-            <% else %>
+            {% else %}
             nickname='fedmsg-releng',
-            <% end %>
+            {% endif %}
             channel='fedora-releng',
             filters=dict(
                 topic=[
@@ -74,11 +74,11 @@ config = dict(
             make_pretty=True,
             make_terse=True,
 
-            <% if environment == 'staging' %>
+            {% if environment == 'staging' %}
             nickname='fedmsg-pfi-stg',
-            <% else %>
+            {% else %}
             nickname='fedmsg-pfi',
-            <% end %>
+            {% endif %}
             channel='#proyecto-fedora',
             # If the word proyecto appears in any message, forward it.
             filters=dict(
@@ -93,11 +93,11 @@ config = dict(
             make_pretty=True,
             make_terse=True,
 
-            <% if environment == 'staging' %>
+            {% if environment == 'staging' %}
             nickname='fedmsg-latam-stg',
-            <% else %>
+            {% else %}
             nickname='fedmsg-latam',
-            <% end %>
+            {% endif %}
             channel='#fedora-latam',
             # If the word fedora-latam appears in any message, forward it.
             filters=dict(