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
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
}
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
getconf type; desttype=$type
getconf user; destuser=$user
getconf host; desthost=$host
+getconf sshoptions
check_consistency "destination" "$type" "$user" "$host"
### CHECK CONFIG ###
fi
# check the connection at the source and destination
+[ -n "$test" ] || test=0
if [ "$testconnect" = "yes" ] || [ "${test}" -eq 1 ]; then
test_connection $sourceuser $sourcehost
test_connection $destuser $desthost
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."
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 "
set -o noglob
+symlinks_warning="Maybe you have mixed symlinks and '*' in this statement, which is not supported."
+
# TODO: order the includes and excludes
# excludes
for i in $exclude; do
- str="${i//__star__/*}"
- execstr="${execstr}--exclude '$str' "
+ str="${i//__star__/*}"
+ execstr="${execstr}--exclude '$str' "
done
# includes
for i in $include; do
- [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'"
- str="${i//__star__/*}"
- execstr="${execstr}--include '$str' "
+ [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'"
+ str="${i//__star__/*}"
+ execstr="${execstr}--include '$str' "
done
# vsinclude
for vserver in $vsnames; do
for vi in $vsinclude; do
str="${vi//__star__/*}"
- execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
+ str="$VROOTDIR/$vserver$str"
+ if [ -n "$str" ]; then
+ execstr="${execstr}--include '$str' "
+ else
+ warning "vsinclude statement '${vi//__star__/*}' will be ignored for VServer $vserver. $symlinks_warning"
+ fi
done
done
fi
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