From f3ce57252a627266da6619211edc4fac83eef13b Mon Sep 17 00:00:00 2001
From: John Carlyle-Clarke <john.carlyle-clarke@fastmarkets.com>
Date: Thu, 17 Mar 2016 15:06:01 +0000
Subject: [PATCH] Allow nesting commands under minion names in master ACL
 config

---
 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 0f35b2a54..23bd24564 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -323,11 +323,9 @@ event_return_blacklist:
 # disabled.
 {% 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: