valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:saltstack/salt into develop

Browse Source
This commit is contained in:
Pedro Algarvio 2012-09-26 16:18:30 +01:00
commit 05a842a5d8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/ref/clientacl.rst
View File

@ -24,14 +24,17 @@ specified user. This configuration is much like the ``peer`` configuration:
Permission Issues Permission Issues
================= =================
Earlier versions of salt set overly restrictive permissions on some of the Directories required for ``client_acl`` must be modified to be readable by the
directories required for ``client_acl`` support. These directories will need users specified:
to be manually modified if upgrading from an earlier version.
.. 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 .. code-block:: bash
chmod 755 /var/cache/salt
chmod 755 /var/cache/salt/jobs
chmod 755 /var/run/salt
rm /var/cache/salt/.*keys rm /var/cache/salt/.*keys
service salt-master restart service salt-master restart

3
salt/utils/yaml.py
View File

@ -34,6 +34,9 @@ class CustomeConstructor(yaml.constructor.SafeConstructor):
raise ConstructorError(None, None, raise ConstructorError(None, None,
'expected a mapping node, but found {0}'.format(node.id), 'expected a mapping node, but found {0}'.format(node.id),
node.start_mark) node.start_mark)
self.flatten_mapping(node)
mapping = {} mapping = {}
for key_node, value_node in node.value: for key_node, value_node in node.value:
key = self.construct_object(key_node, deep=deep) key = self.construct_object(key_node, deep=deep)