Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-11-08 11:52:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

dup: more or less support duplicity 0.4.2 (bandwidthlimit maybe not working anymore, though)

Browse Source
This commit is contained in:
intrigeri 2006-06-03 21:08:38 +00:00
parent a031bc2d53
commit 914e3c958c
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
NEWS
View File

@ -1,5 +1,8 @@
WARNING FOR DUPLICITY USERS
Old (pre-0.9.4) example.dup file used to give false information about the way
the GnuPG-related options are used. Please read the new example.dup file, and
update your own configuration files if needed.
1. Old (pre-0.9.4) example.dup file used to give false information about the way
the GnuPG-related options are used. Please read the new example.dup file, and
update your own configuration files if needed.
2. The bandwidthlimit option does not work anymore with duplicity >=0.4.2.
Trying to solve this...

1
examples/example.dup
View File

@ -105,6 +105,7 @@ exclude = /home/*/.gnupg
#keep = yes
# bandwith limit, in kbit/s ; default is 0, i.e. no limit
# NB: does not work anymore with duplicity >=0.4.2, work in progress to fix this
#bandwidthlimit = 128
# passed directly to ssh and scp

16
handlers/dup
View File

@ -53,6 +53,7 @@ else
[ -z "$vsinclude" ] || warning 'vservers support disabled in backupninja.conf, vsincludes configuration lines will be ignored'
fi
### see if we can login ###
if [ "$testconnect" == "yes" ]; then
@ -69,10 +70,23 @@ fi
### COMMAND-LINE MANGLING ###
# duplicity >= 0.4.2 needs --sftp-command (NB: sftp does not support the -l option)
duplicity_version="`duplicity --version | awk '{print $2}'`"
duplicity_major="`echo $duplicity_version | awk -F '.' '{print $1}'`"
duplicity_minor="`echo $duplicity_version | awk -F '.' '{print $2}'`"
duplicity_sub="`echo $duplicity_version | awk -F '.' '{print $3}'`"
if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 4 -a "$duplicity_sub" -ge 2 ]; then
sftpoptions="$sshoptions"
fi
scpoptions="$sshoptions"
[ "$bandwidthlimit" == 0 ] || scpoptions="$scpoptions -l $bandwidthlimit"
execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --ssh-command 'ssh $sshoptions' "
if [ -z "$sftpoptions" ]; then
execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --ssh-command 'ssh $sshoptions' "
else
execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --sftp-command 'sftp $sftpoptions' --ssh-command 'ssh $sshoptions' "
fi
# deal with symmetric or asymmetric (public/private key pair) encryption
if [ -n "$encryptkey" ]; then

1
handlers/dup.helper
View File

@ -398,6 +398,7 @@ incremental = $dup_incremental
keep = $dup_keep
# bandwith limit, in kbit/s ; default is 0, i.e. no limit
# NB: does not work anymore with duplicity >=0.4.2, work in progress to fix this
#bandwidthlimit = 128
bandwidthlimit = $dup_bandwidth