projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Color comments were wrong - error is red, fatal is purple. Comments
[matthijs/upstream/backupninja.git]
/
handlers
/
dup
diff --git
a/handlers/dup
b/handlers/dup
index 3b4d0323947d4e84775e262a6b1a189c98b95915..8d38cfc5996f212a5b1840de7e939ac3c31966a3 100644
(file)
--- a/
handlers/dup
+++ b/
handlers/dup
@@
-19,6
+19,7
@@
getconf vsinclude
getconf exclude
setsection dest
getconf exclude
setsection dest
+getconf incremental yes
getconf keep 60
getconf sshoptions
getconf bandwidthlimit 0
getconf keep 60
getconf sshoptions
getconf bandwidthlimit 0
@@
-39,7
+40,7
@@
if [ "$vservers" == "yes" ]; then
[ -d "$VROOTDIR" ] || fatal "vservers enabled, but $VROOTDIR does not exist!"
if [ "$vsnames" == "all" ]; then
vsnames=""
[ -d "$VROOTDIR" ] || fatal "vservers enabled, but $VROOTDIR does not exist!"
if [ "$vsnames" == "all" ]; then
vsnames=""
- for vserver in `ls $VROOTDIR | grep -
v lost+found | grep -v ARCHIVES
`; do
+ for vserver in `ls $VROOTDIR | grep -
E -v "lost+found|ARCHIVES"
`; do
vsnames="$vserver $vsnames"
done
else
vsnames="$vserver $vsnames"
done
else
@@
-62,7
+63,7
@@
fi
if [ "$testconnect" == "yes" ]; then
debug "ssh $sshoptions -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'"
if [ ! $test ]; then
if [ "$testconnect" == "yes" ]; then
debug "ssh $sshoptions -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'"
if [ ! $test ]; then
- result=`ssh $sshoptions -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'
2>&1
`
+ result=`ssh $sshoptions -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'`
if [ "$result" != "1" ]; then
fatal "Can't connect to $desthost as $destuser."
else
if [ "$result" != "1" ]; then
fatal "Can't connect to $desthost as $destuser."
else
@@
-92,6
+93,10
@@
if [ "$keep" != "yes" ]; then
execstr="${execstr}--remove-older-than $keep "
fi
execstr="${execstr}--remove-older-than $keep "
fi
+if [ "$incremental" == "no" ]; then
+ execstr="${execstr}--full "
+fi
+
execstr_serverpart="scp://$destuser@$desthost/$destdir"
execstr_clientpart="/"
execstr_serverpart="scp://$destuser@$desthost/$destdir"
execstr_clientpart="/"
@@
-131,17
+136,17
@@
execstr=${execstr//\\*/\\\\\\*}
debug "duplicity $execstr --exclude '**' / $execstr_serverpart"
if [ ! $test ]; then
debug "duplicity $execstr --exclude '**' / $execstr_serverpart"
if [ ! $test ]; then
+ export PASSPHRASE=$password
output=`nice -n $nicelevel \
su -c \
output=`nice -n $nicelevel \
su -c \
- "export PASSPHRASE=$password \
- && duplicity $execstr --exclude '**' / $execstr_serverpart 2>&1"`
+ "duplicity $execstr --exclude '**' / $execstr_serverpart 2>&1"`
code=$?
code=$?
- if [
"$code" == "0"
]; then
+ if [
$code -eq 0
]; then
debug $output
info "Duplicity finished successfully."
else
debug $output
info "Duplicity finished successfully."
else
-
warnin
g $output
-
warning
"Duplicity failed."
+
debu
g $output
+
fatal
"Duplicity failed."
fi
fi
fi
fi