x/timmy
Code Issues Proposed changes

added: filters to avoid collecting of ssl keys

Browse Source
This commit is contained in:
Aleksandr Dobdin 2016-09-07 14:12:05 +00:00
parent 3af36b9eae
commit ab0ee67357
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
timmy/tools.py
View File

@ -278,11 +278,13 @@ def get_files_rsync(ip, data, ssh_opts, dpath, timeout=15):
if (ip in ['localhost', '127.0.0.1']) or ip.startswith('127.'): if (ip in ['localhost', '127.0.0.1']) or ip.startswith('127.'):
logger.info("skip ssh rsync") logger.info("skip ssh rsync")
cmd = ("timeout '%s' rsync -avzr --files-from=- / '%s'" cmd = ("timeout '%s' rsync -avzr --files-from=- / '%s'"
" --exclude '*/ssl/*' --exclude '*/fernet-keys/*'"
" --progress --partial --delete-before" % " --progress --partial --delete-before" %
(timeout, dpath)) (timeout, dpath))
else: else:
cmd = ("timeout '%s' rsync -avzr -e 'ssh %s" cmd = ("timeout '%s' rsync -avzr -e 'ssh %s"
" -oCompression=no' --files-from=- '%s':/ '%s'" " -oCompression=no' --files-from=- '%s':/ '%s'"
" --exclude '*/ssl/*' --exclude '*/fernet-keys/*'"
" --progress --partial --delete-before" " --progress --partial --delete-before"
) % (timeout, ssh_opts, ip, dpath) ) % (timeout, ssh_opts, ip, dpath)
logger.debug("command:%s\ndata:\n%s" % (cmd, data)) logger.debug("command:%s\ndata:\n%s" % (cmd, data))