From: intrigeri Date: Fri, 27 May 2005 18:41:40 +0000 (+0000) Subject: Duplicity handler: added "bandwidthlimit" option. X-Git-Tag: backupninja-0.7~35 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=cadfdca981b3dd98c2031e2d5c6e8ed5da1ac315;p=matthijs%2Fupstream%2Fbackupninja.git Duplicity handler: added "bandwidthlimit" option. --- diff --git a/changelog b/changelog index 44d169a..ca0179d 100644 --- a/changelog +++ b/changelog @@ -14,6 +14,7 @@ version 0.x -- xxxxxxxxxxxxx added "nicelevel" option added "testconnect" option added "sshoptions" option (will be passed to ssh/scp) + added "bandwidthlimit" option example.dup example config file for duplicity handler added trac (http://trac.edgewall.com/) environment handler (thanks Charles Lepple!) diff --git a/etc/backup.d/example.dup b/etc/backup.d/example.dup index b8c2661..faea3b8 100644 --- a/etc/backup.d/example.dup +++ b/etc/backup.d/example.dup @@ -75,7 +75,10 @@ exclude = /home/*/.gnupg #keep = 60 #keep = yes -## passed directly to ssh/scp +# bandwith limit, in kbit/s ; default is 0, i.e. no limit +#bandwidthlimit = 128 + +# passed directly to ssh and scp sshoptions = -i /root/.ssh/id_dsa_duplicity # put the backups under this directory diff --git a/handlers/dup b/handlers/dup index 2d759b0..55667f6 100644 --- a/handlers/dup +++ b/handlers/dup @@ -19,6 +19,7 @@ getconf exclude setsection dest getconf keep 60 getconf sshoptions +getconf bandwidthlimit 0 getconf desthost getconf destdir getconf destuser @@ -43,7 +44,10 @@ fi ### COMMAND-LINE MANGLING ### -execstr="$options --no-print-statistics --scp-command 'scp $sshoptions' --ssh-command 'ssh $sshoptions' " +scpoptions="$sshoptions" +[ "$bandwidthlimit" == 0 ] || scpoptions="$scpoptions -l $bandwidthlimit" + +execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --ssh-command 'ssh $sshoptions' " if [ "$encryptkey" == "" ]; then [ "$sign" != "yes" ] || fatal "encryptkey option must be set when signing."