From d7dfa9aa4712aed8cec0f8320937247fbac4fa2e Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sun, 7 Dec 2014 14:46:05 +0100
Subject: [PATCH] Port templates to jinja2

---
 .../{ykksm-config.php.erb => ykksm-config.php.j2}         | 4 ++--
 .../{ykval-config.php.erb => ykval-config.php.j2}         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename roles/yubikey/templates/{ykksm-config.php.erb => ykksm-config.php.j2} (54%)
 rename roles/yubikey/templates/{ykval-config.php.erb => ykval-config.php.j2} (94%)

diff --git a/roles/yubikey/templates/ykksm-config.php.erb b/roles/yubikey/templates/ykksm-config.php.j2
similarity index 54%
rename from roles/yubikey/templates/ykksm-config.php.erb
rename to roles/yubikey/templates/ykksm-config.php.j2
index 471bdf201c..d49108a570 100644
--- a/roles/yubikey/templates/ykksm-config.php.erb
+++ b/roles/yubikey/templates/ykksm-config.php.j2
@@ -1,7 +1,7 @@
 <?php
-$db_dsn      = "<%= db_dsn %>";
+$db_dsn      = "{{ db_dsn }}";
 $db_username = "ykksmreader";
-$db_password = "<%= ykksmreaderPassword %>";
+$db_password = "{{ ykksmreaderPassword }}";
 $db_options  = array();
 $logfacility = LOG_LOCAL0;
 ?>
diff --git a/roles/yubikey/templates/ykval-config.php.erb b/roles/yubikey/templates/ykval-config.php.j2
similarity index 94%
rename from roles/yubikey/templates/ykval-config.php.erb
rename to roles/yubikey/templates/ykval-config.php.j2
index ea8bfb0a69..8e2a51e1a1 100644
--- a/roles/yubikey/templates/ykval-config.php.erb
+++ b/roles/yubikey/templates/ykval-config.php.j2
@@ -2,13 +2,13 @@
 
 # For the validation interface.
 $baseParams = array ();
-<% if environment == "staging" %>
+{% if env == "staging" %}
 $baseParams['__YKVAL_DB_DSN__'] = "pgsql:dbname=ykval;host=db-fas01.stg";
-<% else %>
+{% else %}
 $baseParams['__YKVAL_DB_DSN__'] = "pgsql:dbname=ykval;host=db-ykval";
-<% end %>
+{% endif %}
 $baseParams['__YKVAL_DB_USER__'] = 'ykval_verifier';
-$baseParams['__YKVAL_DB_PW__'] = '<%= ykvalDBPassword %>';
+$baseParams['__YKVAL_DB_PW__'] = '{{ ykvalDBPassword }}';
 $baseParams['__YKVAL_DB_OPTIONS__'] = array();
 
 # For the validation server sync