From 1d2bb3f8c7e8aa7e99a6395df97f4a76616962c9 Mon Sep 17 00:00:00 2001 From: Ben Davis Date: Tue, 25 Sep 2012 18:24:14 -0500 Subject: [PATCH 1/2] Fixed support for YAML "<<" merge operator --- salt/utils/yaml.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/salt/utils/yaml.py b/salt/utils/yaml.py index fa2c583f5e..834b8f3c6e 100644 --- a/salt/utils/yaml.py +++ b/salt/utils/yaml.py @@ -34,6 +34,9 @@ class CustomeConstructor(yaml.constructor.SafeConstructor): raise ConstructorError(None, None, 'expected a mapping node, but found {0}'.format(node.id), node.start_mark) + + self.flatten_mapping(node) + mapping = {} for key_node, value_node in node.value: key = self.construct_object(key_node, deep=deep) From 810c1ca3adfca5448db9a16431faa5859a48d7af Mon Sep 17 00:00:00 2001 From: Sean Channel Date: Tue, 25 Sep 2012 19:24:33 -0700 Subject: [PATCH 2/2] make it not a bug --- doc/ref/clientacl.rst | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/ref/clientacl.rst b/doc/ref/clientacl.rst index f085d3c3a6..4afe0bf4e8 100644 --- a/doc/ref/clientacl.rst +++ b/doc/ref/clientacl.rst @@ -24,14 +24,17 @@ specified user. This configuration is much like the ``peer`` configuration: Permission Issues ================= -Earlier versions of salt set overly restrictive permissions on some of the -directories required for ``client_acl`` support. These directories will need -to be manually modified if upgrading from an earlier version. +Directories required for ``client_acl`` must be modified to be readable by the +users specified: + +.. code-block:: bash + + chmod 755 /var/cache/salt /var/cache/salt/jobs /var/run/salt + +If you are upgrading from earlier versions of salt you must also remove any +existing user keys and re-start the Salt master: .. code-block:: bash - chmod 755 /var/cache/salt - chmod 755 /var/cache/salt/jobs - chmod 755 /var/run/salt rm /var/cache/salt/.*keys service salt-master restart