mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #36950 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
This commit is contained in:
Nicole Thomas
GitHub
commit
c1f84388d6
6 changed files with 207 additions and 102 deletions
|
|
@ -1188,9 +1188,9 @@ This option has no default value. Set it to an environment name to ensure that
|
|||
:conf_minion:`top_file_merging_strategy` is left at its default, and
|
||||
:conf_minion:`state_top_saltenv` is set to ``foo``, then any sections for
|
||||
environments other than ``foo`` in the top file for the ``foo`` environment
|
||||
will be ignored. With :conf_minion:`top_file_merging_strategy` set to
|
||||
``base``, all states from all environments in the ``base`` top file will
|
||||
be applied, while all other top files are ignored.
|
||||
will be ignored. With :conf_minion:`state_top_saltenv` set to ``base``, all
|
||||
states from all environments in the ``base`` top file will be applied,
|
||||
while all other top files are ignored.
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
|
|
|||
|
|
@ -429,11 +429,6 @@ If the ``qa`` environment were specified, the :ref:`highstate
|
|||
Scenario 2 - No Environment Specified, :conf_minion:`top_file_merging_strategy` is "merge"
|
||||
------------------------------------------------------------------------------------------
|
||||
|
||||
.. versionchanged:: Carbon
|
||||
The default merging strategy has been renamed from ``merge`` to
|
||||
``default`` to reflect the fact that SLS names from identical targets in
|
||||
matching environments from multiple top files are not actually merged.
|
||||
|
||||
In this scenario, assuming that the ``base`` environment's top file was
|
||||
evaluated first, the ``base1``, ``dev1``, and ``qa1`` states would be applied
|
||||
to all minions. If, for instance, the ``qa`` environment is not defined in
|
||||
|
|
|
|||
|
|
@ -76,9 +76,14 @@ def show_link(name):
|
|||
salt '*' alternatives.show_link editor
|
||||
'''
|
||||
|
||||
path = '/var/lib/dpkg/alternatives/{0}'.format(name)
|
||||
if _get_cmd() == 'alternatives':
|
||||
path = '/var/lib/alternatives/{0}'.format(name)
|
||||
if __grains__['os_family'] == 'RedHat':
|
||||
path = '/var/lib/'
|
||||
elif __grains__['os_family'] == 'Suse':
|
||||
path = '/var/lib/rpm/'
|
||||
else:
|
||||
path = '/var/lib/dpkg/'
|
||||
|
||||
path += 'alternatives/{0}'.format(name)
|
||||
|
||||
try:
|
||||
with salt.utils.fopen(path, 'rb') as r_file:
|
||||
|
|
|
|||
|
|
@ -3748,6 +3748,10 @@ def check_perms(name, ret, user, group, mode, follow_symlinks=False):
|
|||
perms = {}
|
||||
cur = stats(name, follow_symlinks=follow_symlinks)
|
||||
if not cur:
|
||||
# NOTE: The file.directory state checks the content of the error
|
||||
# message in this exception. Any changes made to the message for this
|
||||
# exception will reflect the file.directory state as well, and will
|
||||
# likely require changes there.
|
||||
raise CommandExecutionError('{0} does not exist'.format(name))
|
||||
perms['luser'] = cur['user']
|
||||
perms['lgroup'] = cur['group']
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# # -*- coding: utf-8 -*-
|
||||
# -*- coding: utf-8 -*-
|
||||
'''
|
||||
Manage a GPG keychains, add keys, create keys, retrieve keys
|
||||
from keyservers. Sign, encrypt and sign & encrypt text and files.
|
||||
|
|
@ -14,6 +14,7 @@ from keyservers. Sign, encrypt and sign & encrypt text and files.
|
|||
# Import python libs
|
||||
from __future__ import absolute_import
|
||||
import distutils.version # pylint: disable=import-error,no-name-in-module
|
||||
import functools
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
|
|
@ -105,32 +106,90 @@ def __virtual__():
|
|||
' gnupg python module is not installed.')
|
||||
|
||||
|
||||
def _get_user_info(user=None):
|
||||
'''
|
||||
Wrapper for user.info Salt function
|
||||
'''
|
||||
if not user:
|
||||
# Get user Salt runnining as
|
||||
user = __salt__['config.option']('user')
|
||||
|
||||
userinfo = __salt__['user.info'](user)
|
||||
|
||||
if not userinfo:
|
||||
if user == 'salt':
|
||||
# Special case with `salt` user:
|
||||
# if it doesn't exist then fall back to user Salt running as
|
||||
userinfo = _get_user_info()
|
||||
else:
|
||||
raise SaltInvocationError('User {0} does not exist'.format(user))
|
||||
|
||||
return userinfo
|
||||
|
||||
|
||||
def _get_user_gnupghome(user):
|
||||
'''
|
||||
Return default GnuPG home directory path for a user
|
||||
'''
|
||||
if user == 'salt':
|
||||
gnupghome = os.path.join(salt.syspaths.CONFIG_DIR, 'gpgkeys')
|
||||
else:
|
||||
gnupghome = os.path.join(_get_user_info(user)['home'], '.gnupg')
|
||||
|
||||
return gnupghome
|
||||
|
||||
|
||||
def _restore_ownership(func):
|
||||
@functools.wraps(func)
|
||||
def func_wrapper(*args, **kwargs):
|
||||
'''
|
||||
Wrap gpg function calls to fix permissions
|
||||
'''
|
||||
user = kwargs.get('user')
|
||||
gnupghome = kwargs.get('gnupghome')
|
||||
|
||||
if not gnupghome:
|
||||
gnupghome = _get_user_gnupghome(user)
|
||||
|
||||
userinfo = _get_user_info(user)
|
||||
run_user = _get_user_info()
|
||||
|
||||
if userinfo['uid'] != run_user['uid'] and os.path.exists(gnupghome):
|
||||
# Given user is different from one who runs Salt process,
|
||||
# need to fix ownership permissions for GnuPG home dir
|
||||
group = __salt__['file.gid_to_group'](run_user['gid'])
|
||||
for path in [gnupghome] + __salt__['file.find'](gnupghome):
|
||||
__salt__['file.chown'](path, run_user['name'], group)
|
||||
|
||||
# Filter special kwargs
|
||||
for key in kwargs.keys():
|
||||
if key.startswith('__'):
|
||||
del kwargs[key]
|
||||
|
||||
ret = func(*args, **kwargs)
|
||||
|
||||
if userinfo['uid'] != run_user['uid']:
|
||||
group = __salt__['file.gid_to_group'](userinfo['gid'])
|
||||
for path in [gnupghome] + __salt__['file.find'](gnupghome):
|
||||
__salt__['file.chown'](path, user, group)
|
||||
|
||||
return ret
|
||||
|
||||
return func_wrapper
|
||||
|
||||
|
||||
def _create_gpg(user=None, gnupghome=None):
|
||||
'''
|
||||
Create the GPG object
|
||||
'''
|
||||
if not user:
|
||||
user = __salt__['config.option']('user')
|
||||
|
||||
if user == 'salt':
|
||||
if gnupghome:
|
||||
homeDir = gnupghome
|
||||
else:
|
||||
homeDir = os.path.join(salt.syspaths.CONFIG_DIR, 'gpgkeys')
|
||||
else:
|
||||
if gnupghome:
|
||||
homeDir = gnupghome
|
||||
else:
|
||||
userinfo = __salt__['user.info'](user)
|
||||
if userinfo:
|
||||
homeDir = '{0}/.gnupg'.format(userinfo['home'])
|
||||
else:
|
||||
raise SaltInvocationError('User does not exist')
|
||||
if not gnupghome:
|
||||
gnupghome = _get_user_gnupghome(user)
|
||||
|
||||
if GPG_1_3_1:
|
||||
gpg = gnupg.GPG(homedir='{0}'.format(homeDir))
|
||||
gpg = gnupg.GPG(homedir=gnupghome)
|
||||
else:
|
||||
gpg = gnupg.GPG(gnupghome='{0}'.format(homeDir))
|
||||
gpg = gnupg.GPG(gnupghome=gnupghome)
|
||||
|
||||
return gpg
|
||||
|
||||
|
||||
|
|
@ -163,11 +222,12 @@ def search_keys(text, keyserver=None, user=None):
|
|||
Text to search the keyserver for, e.g. email address, keyID or fingerprint.
|
||||
|
||||
keyserver
|
||||
Keyserver to use for searching for GPG keys, defaults to pgp.mit.edu
|
||||
Keyserver to use for searching for GPG keys, defaults to pgp.mit.edu.
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -212,11 +272,12 @@ def list_keys(user=None, gnupghome=None):
|
|||
List keys in GPG keychain
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -258,17 +319,19 @@ def list_secret_keys(user=None, gnupghome=None):
|
|||
List secret keys in GPG keychain
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt '*' gpg.list_secret_keys
|
||||
|
||||
'''
|
||||
_keys = []
|
||||
for _key in _list_keys(user, gnupghome, secret=True):
|
||||
|
|
@ -298,6 +361,7 @@ def list_secret_keys(user=None, gnupghome=None):
|
|||
return _keys
|
||||
|
||||
|
||||
@_restore_ownership
|
||||
def create_key(key_type='RSA',
|
||||
key_length=1024,
|
||||
name_real='Autogenerated Key',
|
||||
|
|
@ -353,14 +417,16 @@ def create_key(key_type='RSA',
|
|||
an epoch value, or 0 for a non-expiring key.
|
||||
|
||||
use_passphrase
|
||||
Whether to use a passphrase with the signing key. Passphrase is received from pillar.
|
||||
Whether to use a passphrase with the signing key. Passphrase is received
|
||||
from Pillar.
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -435,11 +501,12 @@ def delete_key(keyid=None,
|
|||
Secret keys must be deleted before deleting any corresponding public keys.
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -504,11 +571,12 @@ def get_key(keyid=None, fingerprint=None, user=None, gnupghome=None):
|
|||
The fingerprint of the key to be retrieved.
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -563,11 +631,12 @@ def get_secret_key(keyid=None, fingerprint=None, user=None, gnupghome=None):
|
|||
The fingerprint of the key to be retrieved.
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -611,6 +680,7 @@ def get_secret_key(keyid=None, fingerprint=None, user=None, gnupghome=None):
|
|||
return tmp
|
||||
|
||||
|
||||
@_restore_ownership
|
||||
def import_key(user=None,
|
||||
text=None,
|
||||
filename=None,
|
||||
|
|
@ -619,8 +689,9 @@ def import_key(user=None,
|
|||
Import a key from text or file
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
text
|
||||
The text containing to import.
|
||||
|
|
@ -629,7 +700,7 @@ def import_key(user=None,
|
|||
The filename containing the key to import.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -698,11 +769,12 @@ def export_key(keyids=None, secret=False, user=None, gnupghome=None):
|
|||
Export the secret key identified by the keyid information passed.
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -722,6 +794,7 @@ def export_key(keyids=None, secret=False, user=None, gnupghome=None):
|
|||
return gpg.export_keys(keyids, secret)
|
||||
|
||||
|
||||
@_restore_ownership
|
||||
def receive_keys(keyserver=None, keys=None, user=None, gnupghome=None):
|
||||
'''
|
||||
Receive key(s) from keyserver and add them to keychain
|
||||
|
|
@ -734,18 +807,23 @@ def receive_keys(keyserver=None, keys=None, user=None, gnupghome=None):
|
|||
separated string or a list.
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt '*' gpg.receive_key keys='3FAD9F1E'
|
||||
salt '*' gpg.receive_keys keys='3FAD9F1E'
|
||||
|
||||
salt '*' gpg.receive_key keys="['3FAD9F1E','3FBD9F2E']"
|
||||
salt '*' gpg.receive_keys keys="['3FAD9F1E','3FBD9F2E']"
|
||||
|
||||
salt '*' gpg.receive_keys keys=3FAD9F1E user=username
|
||||
|
||||
salt '*' gpg.receive_key keys=3FAD9F1E user=username
|
||||
'''
|
||||
ret = {
|
||||
'res': True,
|
||||
|
|
@ -792,8 +870,9 @@ def trust_key(keyid=None,
|
|||
expired, unknown, not_trusted, marginally, fully, ultimately
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -802,6 +881,7 @@ def trust_key(keyid=None,
|
|||
salt '*' gpg.trust_key keyid='3FAD9F1E' trust_level='marginally'
|
||||
salt '*' gpg.trust_key fingerprint='53C96788253E58416D20BCD352952C84C3252192' trust_level='not_trusted'
|
||||
salt '*' gpg.trust_key keys=3FAD9F1E trust_level='ultimately' user='username'
|
||||
|
||||
'''
|
||||
ret = {
|
||||
'res': True,
|
||||
|
|
@ -885,8 +965,9 @@ def sign(user=None,
|
|||
Sign message or file
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
keyid
|
||||
The keyid of the key to set the trust level for, defaults to
|
||||
|
|
@ -902,10 +983,11 @@ def sign(user=None,
|
|||
The filename where the signed file will be written, default is standard out.
|
||||
|
||||
use_passphrase
|
||||
Whether to use a passphrase with the signing key. Passphrase is received from pillar.
|
||||
Whether to use a passphrase with the signing key. Passphrase is received
|
||||
from Pillar.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -962,11 +1044,12 @@ def verify(text=None,
|
|||
The filename to verify.
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -1015,8 +1098,9 @@ def encrypt(user=None,
|
|||
Encrypt a message or file
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
recipients
|
||||
The fingerprints for those recipient whom the data is being encrypted for.
|
||||
|
|
@ -1031,18 +1115,19 @@ def encrypt(user=None,
|
|||
The filename where the signed file will be written, default is standard out.
|
||||
|
||||
sign
|
||||
Whether to sign, in addition to encrypt, the data. True to use default key or fingerprint
|
||||
to specify a different key to sign with.
|
||||
Whether to sign, in addition to encrypt, the data. ``True`` to use
|
||||
default key or fingerprint to specify a different key to sign with.
|
||||
|
||||
use_passphrase
|
||||
Whether to use a passphrase with the signing key. Passphrase is received from pillar.
|
||||
Whether to use a passphrase with the signing key. Passphrase is received
|
||||
from Pillar.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
bare
|
||||
If True, return the (armored) encrypted block as a string without the
|
||||
standard comment/res dict
|
||||
If ``True``, return the (armored) encrypted block as a string without
|
||||
the standard comment/res dict.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -1117,8 +1202,9 @@ def decrypt(user=None,
|
|||
Decrypt a message or file
|
||||
|
||||
user
|
||||
Which user's keychain to access, defaults to user Salt is running as. Passing
|
||||
the user as 'salt' will set the GPG home directory to /etc/salt/gpgkeys.
|
||||
Which user's keychain to access, defaults to user Salt is running as.
|
||||
Passing the user as ``salt`` will set the GnuPG home directory to the
|
||||
``/etc/salt/gpgkeys``.
|
||||
|
||||
text
|
||||
The encrypted text to decrypt.
|
||||
|
|
@ -1130,14 +1216,15 @@ def decrypt(user=None,
|
|||
The filename where the decrypted data will be written, default is standard out.
|
||||
|
||||
use_passphrase
|
||||
Whether to use a passphrase with the signing key. Passphrase is received from pillar.
|
||||
Whether to use a passphrase with the signing key. Passphrase is received
|
||||
from Pillar.
|
||||
|
||||
gnupghome
|
||||
Specify the location where GPG related files are stored.
|
||||
Specify the location where GPG keyring and related files are stored.
|
||||
|
||||
bare
|
||||
If True, return the (armored) decrypted block as a string without the
|
||||
standard comment/res dict
|
||||
If ``True``, return the (armored) decrypted block as a string without the
|
||||
standard comment/res dict.
|
||||
|
||||
CLI Example:
|
||||
|
||||
|
|
@ -1147,7 +1234,6 @@ def decrypt(user=None,
|
|||
|
||||
salt '*' gpg.decrypt filename='/path/to/important.file.gpg' use_pasphrase=True
|
||||
|
||||
|
||||
'''
|
||||
ret = {
|
||||
'res': True,
|
||||
|
|
|
|||
|
|
@ -2073,6 +2073,7 @@ def directory(name,
|
|||
dir_mode,
|
||||
follow_symlinks)
|
||||
|
||||
errors = []
|
||||
if recurse or clean:
|
||||
walk_l = list(os.walk(name)) # walk path only once and store the result
|
||||
# root: (dirs, files) structure, compatible for python2.6
|
||||
|
|
@ -2134,23 +2135,31 @@ def directory(name,
|
|||
if check_files:
|
||||
for fn_ in files:
|
||||
full = os.path.join(root, fn_)
|
||||
ret, perms = __salt__['file.check_perms'](
|
||||
full,
|
||||
ret,
|
||||
user,
|
||||
group,
|
||||
file_mode,
|
||||
follow_symlinks)
|
||||
try:
|
||||
ret, _ = __salt__['file.check_perms'](
|
||||
full,
|
||||
ret,
|
||||
user,
|
||||
group,
|
||||
file_mode,
|
||||
follow_symlinks)
|
||||
except CommandExecutionError as exc:
|
||||
if not exc.strerror.endswith('does not exist'):
|
||||
errors.append(exc.strerror)
|
||||
if check_dirs:
|
||||
for dir_ in dirs:
|
||||
full = os.path.join(root, dir_)
|
||||
ret, perms = __salt__['file.check_perms'](
|
||||
full,
|
||||
ret,
|
||||
user,
|
||||
group,
|
||||
dir_mode,
|
||||
follow_symlinks)
|
||||
try:
|
||||
ret, _ = __salt__['file.check_perms'](
|
||||
full,
|
||||
ret,
|
||||
user,
|
||||
group,
|
||||
dir_mode,
|
||||
follow_symlinks)
|
||||
except CommandExecutionError as exc:
|
||||
if not exc.strerror.endswith('does not exist'):
|
||||
errors.append(exc.strerror)
|
||||
|
||||
if clean:
|
||||
keep = _gen_keep_files(name, require, walk_d)
|
||||
|
|
@ -2168,6 +2177,12 @@ def directory(name,
|
|||
ret['comment'] = 'Directory {0} not updated'.format(name)
|
||||
elif not ret['changes'] and ret['result']:
|
||||
ret['comment'] = 'Directory {0} is in the correct state'.format(name)
|
||||
|
||||
if errors:
|
||||
ret['result'] = False
|
||||
ret['comment'] += '\n\nThe following errors were encountered:\n'
|
||||
for error in errors:
|
||||
ret['comment'] += '\n- {0}'.format(error)
|
||||
return ret
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue