X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Frdiff;h=5561435331d6c0dab76e2f66678d52cd00309585;hb=65f7b42f544579a8fbf30e82589ef98c6d30e9ef;hp=88aeaf3fc7b130ac5ee5e437f7c001a58ef216f5;hpb=c1c28e70326ebf75b37d0594df88adaf24045187;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/rdiff b/handlers/rdiff index 88aeaf3..5561435 100644 --- a/handlers/rdiff +++ b/handlers/rdiff @@ -17,8 +17,8 @@ function test_connection() { fi local user=$1 local host=$2 - debug "ssh -o PasswordAuthentication=no $host -l $user 'echo -n 1'" - local ret=`ssh -o PasswordAuthentication=no $host -l $user 'echo -n host is alive'` + debug "ssh $sshoptions -o PasswordAuthentication=no $host -l $user 'echo -n 1'" + local ret=`ssh $sshoptions -o PasswordAuthentication=no $host -l $user 'echo -n host is alive'` if echo $ret | grep "host is alive"; then debug "Connected to $host as $user successfully" else @@ -36,8 +36,8 @@ function get_version() { else local user=$1 local host=$2 - debug "ssh $host -l $user '$RDIFFBACKUP -V'" - echo `ssh $host -l $user "$RDIFFBACKUP -V | grep rdiff-backup"` + debug "ssh $sshoptions $host -l $user '$RDIFFBACKUP -V'" + echo `ssh $sshoptions $host -l $user "$RDIFFBACKUP -V | grep rdiff-backup"` fi } @@ -64,11 +64,19 @@ function check_consistency() { fi } +function check_cstream() { + local cstream=$1 + if [ ! -x $cstream ]; then + fatal "Can't find your cstream binary (trying: $cstream). If you use bwlimit you must have cstream installed." + fi +} + ### GET CONFIG ### getconf options getconf testconnect yes getconf nicelevel 0 +getconf bwlimit setsection source getconf type; sourcetype=$type @@ -89,6 +97,7 @@ destdir=${destdir%/} getconf type; desttype=$type getconf user; destuser=$user getconf host; desthost=$host +getconf sshoptions check_consistency "destination" "$type" "$user" "$host" ### CHECK CONFIG ### @@ -148,15 +157,15 @@ if [ "`echo $keep | tr -d 0-9`" == "" ]; then keep="${keep}D" fi -removestr="$RDIFFBACKUP --force --remove-older-than $keep " +removestr="$RDIFFBACKUP $options --force --remove-older-than $keep " if [ "$desttype" == "remote" ]; then removestr="${removestr}${destuser}@${desthost}::" fi removestr="${removestr}${destdir}/${label}"; debug "$removestr" -if [ ! $test ]; then - output=`$removestr 2>&1` +if [ $test = 0 ]; then + output="`su -c "$removestr" 2>&1`" if [ $? = 0 ]; then debug $output info "Removing backups older than $keep days succeeded." @@ -166,6 +175,19 @@ if [ ! $test ]; then fi fi +# Add cstream + +if [ ! -z $bwlimit ]; then + check_cstream $CSTREAM; + if [ "$desttype" = "remote" ]; then + RDIFFBACKUP="$RDIFFBACKUP --remote-schema 'cstream -t $bwlimit | ssh %s \''rdiff-backup --server\'''" + elif [ "$sourcetype" = "remote" ]; then + RDIFFBACKUP="$RDIFFBACKUP --remote-schema 'ssh %s \''rdiff-backup --server\'' | cstream -t $bwlimit'" + else + fatal "You specified a bandwidth limit but neither your source nor destination types are remote." + fi +fi + ### EXECUTE ### execstr="$RDIFFBACKUP $options --print-statistics " @@ -178,23 +200,13 @@ symlinks_warning="Maybe you have mixed symlinks and '*' in this statement, which # excludes for i in $exclude; do str="${i//__star__/*}" - str=`readlink -f $str` - if [ -n "$str" ]; then - execstr="${execstr}--exclude '$str' " - else - warning "exclude statement '${i//__star__/*}' will be ignored. $symlinks_warning" - fi + execstr="${execstr}--exclude '$str' " done # includes for i in $include; do [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'" str="${i//__star__/*}" - str=`readlink -f $str` - if [ -n "$str" ]; then - execstr="${execstr}--include '$str' " - else - warning "include statement '${i//__star__/*}' will be ignored. $symlinks_warning" - fi + execstr="${execstr}--include '$str' " done # vsinclude @@ -202,7 +214,7 @@ if [ $usevserver = yes ]; then for vserver in $vsnames; do for vi in $vsinclude; do str="${vi//__star__/*}" - str=`readlink -f $VROOTDIR/$vserver$str` + str="$VROOTDIR/$vserver$str" if [ -n "$str" ]; then execstr="${execstr}--include '$str' " else @@ -221,7 +233,7 @@ execstr="${execstr}--exclude '/*' " execstr="${execstr}$execstr_sourcepart $execstr_destpart" debug "$execstr" -if [ ! $test ]; then +if [ $test = 0 ]; then output=`nice -n $nicelevel su -c "$execstr" 2>&1` if [ $? = 0 ]; then debug $output