valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add permission management to file.recurse

Browse Source
This commit is contained in:
Thomas S Hatch 2012-03-17 13:37:22 -06:00
parent 039b4f12f6
commit 62b1b48dd5
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
salt/states/file.py
View File

@ -341,6 +341,11 @@ def _check_perms(name, ret, user, group, mode):
'''
Check the permissions on files and chown if needed
'''
if not ret:
ret = {'name': name,
'changes': {},
'comment': '',
'result': False}
# Check permissions
perms = {}
perms['luser'] = __salt__['file.get_user'](name)
@ -950,6 +955,10 @@ def recurse(name,
source,
clean=False,
require=None,
user=None,
group=None,
dir_mode=None,
file_mode=None,
__env__='base'):
'''
Recurse through a subdirectory on the master and copy said subdirecory
@ -985,6 +994,7 @@ def recurse(name,
return _error(
ret, 'The path {0} exists and is not a directory'.format(name))
os.makedirs(name)
vdir = set()
for fn_ in __salt__['cp.cache_dir'](source, __env__):
if not fn_.strip():
continue
@ -999,9 +1009,20 @@ def recurse(name,
)
)
)
if not os.path.isdir(os.path.dirname(dest)):
dirname = os.path.dirname(dest)
if not os.path.isdir(dirname):
_makedirs(dest)
if not dirname in vdir:
# verify the directory perms if they are set
# _check_perms(name, ret, user, group, mode)
_ret, perms = _check_perms(dirname, {}, user, group, dir_mode)
if _ret['changes']:
ret['changes'][dirname] = 'updated'
vdir.add(dirname)
if os.path.isfile(dest):
_ret, perms = _check_perms(dest, {}, user, group, file_mode)
if _ret['changes']:
ret['changes'][dest] = 'updated'
keep.add(dest)
srch = ''
dsth = ''