From 51024371d36b6c00bfdae1ed6aac061c373936a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Mon, 20 Jan 2014 18:55:55 +0000
Subject: [PATCH] Mailman: update the variable substitution syntax

---
 .../hosts/lists-dev.cloud.fedoraproject.org.yml      |  2 +-
 roles/mailman/templates/apache-dummy.conf.j2         |  2 +-
 roles/mailman/templates/apache.conf.j2               | 12 ++++++------
 roles/mailman/templates/mailman-hyperkitty.cfg.j2    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
index 6f53d04d3c..ecf74c7b41 100644
--- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
@@ -141,7 +141,7 @@
   #            owner=root group=root mode=0600
 
   - name: send root mail to abompard
-    lineinfile: dest=/etc/aliases regexp='^root:' line='root:\tabompard@fedoraproject.org'
+    lineinfile: dest=/etc/aliases regexp='^root:' line="root:\tabompard@fedoraproject.org"
     notify:
     - reload aliases
 
diff --git a/roles/mailman/templates/apache-dummy.conf.j2 b/roles/mailman/templates/apache-dummy.conf.j2
index 37da0c4354..584a4f036d 100644
--- a/roles/mailman/templates/apache-dummy.conf.j2
+++ b/roles/mailman/templates/apache-dummy.conf.j2
@@ -1 +1 @@
-# See ${mailman_webui_confdir}
+# See {{ mailman_webui_confdir }}
diff --git a/roles/mailman/templates/apache.conf.j2 b/roles/mailman/templates/apache.conf.j2
index 5cc06c5648..58f8a0c5c2 100644
--- a/roles/mailman/templates/apache.conf.j2
+++ b/roles/mailman/templates/apache.conf.j2
@@ -1,18 +1,18 @@
-Alias /robots.txt  ${mailman_webui_basedir}/static/hyperkitty/robots.txt
-Alias /favicon.ico ${mailman_webui_basedir}/static/hyperkitty/favicon.ico
-Alias /static      ${mailman_webui_basedir}/static
+Alias /robots.txt  {{ mailman_webui_basedir }}/static/hyperkitty/robots.txt
+Alias /favicon.ico {{ mailman_webui_basedir }}/static/hyperkitty/favicon.ico
+Alias /static      {{ mailman_webui_basedir }}/static
 
 #ErrorLog /var/log/httpd/webui_error.log
 #CustomLog /var/log/httpd/webui_access.log combined
 
-WSGIScriptAlias / ${mailman_webui_confdir}/webui.wsgi
+WSGIScriptAlias / {{ mailman_webui_confdir }}/webui.wsgi
 WSGIDaemonProcess webui display-name=webui maximum-requests=1000 processes=4 threads=4
 WSGISocketPrefix run/wsgi
 WSGIRestrictStdout On
 WSGIRestrictSignal Off
 WSGIPythonOptimize 1
 
-<Directory "${mailman_webui_confdir}">
+<Directory "{{ mailman_webui_confdir }}">
     <Files webui.wsgi>
         Order deny,allow
         Allow from all
@@ -21,7 +21,7 @@ WSGIPythonOptimize 1
     WSGIProcessGroup webui
 </Directory>
 
-<Directory "${mailman_webui_basedir}/static">
+<Directory "{{ mailman_webui_basedir }}/static">
     Order deny,allow
     Allow from all
     Require all granted
diff --git a/roles/mailman/templates/mailman-hyperkitty.cfg.j2 b/roles/mailman/templates/mailman-hyperkitty.cfg.j2
index fb89efdf9e..b59c1f4689 100644
--- a/roles/mailman/templates/mailman-hyperkitty.cfg.j2
+++ b/roles/mailman/templates/mailman-hyperkitty.cfg.j2
@@ -9,4 +9,4 @@
 
 [general]
 base_url: http://apps.stg.fedoraproject.org/lists
-django_settings: ${mailman_webui_confdir}/settings.py
+django_settings: {{ mailman_webui_confdir }}/settings.py