From dcab81866e4e22494c5d82f5d5964df97913f84c Mon Sep 17 00:00:00 2001
From: Fastmarkets Infrastructure <inf@fastmarkets.com>
Date: Thu, 2 Jul 2015 17:22:14 +0100
Subject: [PATCH] ACL code in master config doesn't allow for nesting commands
 under minion names

---
 salt/files/master.d/f_defaults.conf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index e15689c..714a06c 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -279,11 +279,9 @@ event_return_blacklist:
 #    - network.*
 {% if 'client_acl' in cfg_master -%}
 client_acl:
-{%- for name, user in cfg_master['client_acl']|dictsort %}
+{%- for name, items in cfg_master['client_acl']|dictsort %}
   {{ name}}:
-{%- for command in user %}
-    - {% raw %}'{% endraw %}{{ command }}{% raw %}'{% endraw %}
-{%- endfor -%}
+    {{ items | yaml }}
 {%- endfor -%}
 {% elif 'client_acl' in cfg_salt -%}
 client_acl: