From 88c39caa526237ec1157a042597b42e7324d9d6e Mon Sep 17 00:00:00 2001
From: Chad Heuschober <chad.heuschober@cuny.edu>
Date: Wed, 21 May 2014 15:13:13 -0400
Subject: [PATCH] Adjusts the parameters passed to context to be passed as json
 and hopefully avoid double quoting. Also brings indentation in-line with salt
 doc 23.14.1.2.1

---
 nginx/ng/config.sls        | 2 +-
 nginx/ng/vhosts_config.sls | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx/ng/config.sls b/nginx/ng/config.sls
index c0923a5..6a0c2a6 100644
--- a/nginx/ng/config.sls
+++ b/nginx/ng/config.sls
@@ -11,4 +11,4 @@ nginx_config:
     - source: salt://nginx/ng/files/nginx.conf
     - template: jinja
     - context:
-      config: {{ nginx.server.config }}
+        config: {{ nginx.server.config|json() }}
diff --git a/nginx/ng/vhosts_config.sls b/nginx/ng/vhosts_config.sls
index e204d4d..8693fea 100644
--- a/nginx/ng/vhosts_config.sls
+++ b/nginx/ng/vhosts_config.sls
@@ -93,7 +93,7 @@ nginx_vhost_available_dir:
     - source: salt://nginx/ng/files/vhost.conf
     - template: jinja
     - context:
-      config: {{ settings.config }}
+        config: {{ settings.config|json() }}
 {% do vhost_states.append(conf_state_id) %}
 {% endif %}