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

. fixed errors in create remote dir

Browse Source 
. code formatting cleanup (three spaces indent)
. fixed bug which caused only first include/exclude dir to
  have "include = "
. fixed globbing bug with exclude
This commit is contained in:
Elijah Saxon 2006-01-09 00:23:05 +00:00
parent 413a3be0ac
commit 83b09d71e9
1 changed files with 240 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
handlers/rdiff.helper
View File

@ -4,6 +4,8 @@ HELPERS="$HELPERS rdiff:incremental_remote_filesystem_backup"
declare -a rdiff_includes declare -a rdiff_includes
declare -a rdiff_excludes declare -a rdiff_excludes
declare -a rdiff_vsincludes
declare -a rdiff_vsexcludes
# FUNCTIONS # FUNCTIONS
@ -11,11 +13,9 @@ do_rdiff_host_includes() {
set -o noglob set -o noglob
# choose the files to backup # choose the files to backup
REPLY= REPLY=
while [ -z "$REPLY" ] while [ -z "$REPLY" ]; do
do
formBegin "$rdiff_title - host system: includes" formBegin "$rdiff_title - host system: includes"
for ((i=0; i < ${#rdiff_includes[@]} ; i++)) for ((i=0; i < ${#rdiff_includes[@]} ; i++)); do
do
formItem include ${rdiff_includes[$i]} formItem include ${rdiff_includes[$i]}
done done
formItem include formItem include
@ -24,7 +24,7 @@ do_rdiff_host_includes() {
formDisplay formDisplay
[ $? = 0 ] || return [ $? = 0 ] || return
unset rdiff_includes unset rdiff_includes
rdiff_includes="$REPLY" rdiff_includes=($REPLY)
done done
set +o noglob set +o noglob
} }
@ -45,13 +45,12 @@ do_rdiff_vserver() {
for i in $rdiff_vsincludes; do for i in $rdiff_vsincludes; do
formItem include "$i" formItem include "$i"
done done
formItem include "" formItem include ""
formItem include "" formItem include ""
formItem include "" formItem include ""
formDisplay formDisplay
[ $? = 0 ] || return 1 [ $? = 0 ] || return 1
rdiff_vsincludes="$REPLY" rdiff_vsincludes=($REPLY)
done done
set +o noglob set +o noglob
@ -64,14 +63,12 @@ do_rdiff_excludes() {
do do
formItem exclude ${rdiff_excludes[$i]} formItem exclude ${rdiff_excludes[$i]}
done done
formItem exclude formItem exclude
formItem exclude formItem exclude
formDisplay formDisplay
[ $? = 0 ] || return [ $? = 0 ] || return
unset rdiff_excludes unset rdiff_excludes
rdiff_excludes="$REPLY" rdiff_excludes=($REPLY)
set +o noglob set +o noglob
} }
@ -104,9 +101,7 @@ do_rdiff_src() {
} }
do_rdiff_dest() { do_rdiff_dest() {
declare -a tmp_array
local replyconverted
local thereply
set -o noglob set -o noglob
REPLY= REPLY=
@ -119,18 +114,11 @@ do_rdiff_dest() {
formItem "dest_user" "$rdiff_user" formItem "dest_user" "$rdiff_user"
formDisplay formDisplay
[ $? = 0 ] || return [ $? = 0 ] || return
tmp_array=($REPLY)
IFS=$'' rdiff_keep=${tmp_array[0]}
replyconverted=`echo $REPLY | tr '\n' :` rdiff_directory=${tmp_array[1]}
IFS=$':' rdiff_host=${tmp_array[2]}
thereply=($replyconverted) rdiff_user=${tmp_array[3]}
IFS=$' \t\n'
rdiff_keep=${thereply[0]}
rdiff_directory=${thereply[1]}
rdiff_host=${thereply[2]}
rdiff_user=${thereply[3]}
done done
set +o noglob set +o noglob
@ -139,6 +127,8 @@ do_rdiff_dest() {
} }
do_rdiff_ssh_con() { do_rdiff_ssh_con() {
local remote_status="ok"
IFS=$' \t\n' IFS=$' \t\n'
if [ "$_dest_done" = "" ]; then if [ "$_dest_done" = "" ]; then
msgBox "$rdiff_title: error" "You must first configure the destination." msgBox "$rdiff_title: error" "You must first configure the destination."
@ -187,93 +177,66 @@ do_rdiff_ssh_con() {
echo "Hit return to continue." echo "Hit return to continue."
read read
fi fi
# test to see if the remote rdiff backup directory exists and is writable # test to see if the remote rdiff backup directory exists and is writable
echo "Testing to see if remote rdiff backup directory exists and is writable" echo "Testing to see if remote rdiff backup directory exists and is writable"
ssh $rdiff_user@$rdiff_host "test -d ${rdiff_directory}" ssh $rdiff_user@$rdiff_host "test -d ${rdiff_directory}"
if [ $? -eq 0 ] if [ $? = 0 ]; then
then
ssh $rdiff_user@$rdiff_host "test -w $rdiff_directory" ssh $rdiff_user@$rdiff_host "test -w $rdiff_directory"
if [ $? -ne 0 ] if [ $? != 0 ]; then
then
msgBox "destination directory is not writable!" "The remote destination directory is not writable by the user you specified. Please fix the permissions on the directory and then try again." msgBox "destination directory is not writable!" "The remote destination directory is not writable by the user you specified. Please fix the permissions on the directory and then try again."
remote_status=1 remote_status=failed
else
remote_status=0
fi fi
else else
booleanBox "Remote directory does not exist" "The destination backup directory does not exist, do you want me to create it for you?" booleanBox "Remote directory does not exist" "The destination backup directory does not exist, do you want me to create it for you?"
if [ $? = 0 ] if [ $? = 0 ]; then
then
ssh $rdiff_user@$rdiff_host "mkdir -p ${rdiff_directory}" ssh $rdiff_user@$rdiff_host "mkdir -p ${rdiff_directory}"
result=$? result=$?
echo "Hit return to continue."
read
case $result in case $result in
0) 0) msgBox "$rdiff_title: success" "Creation of the remote destination directory was a success!";;
msgBox "$rdiff_title: success" "Creation of the remote destination directory was a success!" 1) msgBox "$rdiff_title: error" "Connected successfully to $rdiff_user@$rdiff_host, but was unable to create the destination directory, check the directory permissions."
remote_status=0 remote_status=failed;;
;; 255) msgBox "$rdiff_title: error" "Failed to connect to $rdiff_user@$rdiff_host. Check hostname, username, and password. Also, make sure sshd is running on the destination host."
1) remote_status=failed;;
msgBox "$rdiff_title: error" "Connected successfully to $rdiff_user@$rdiff_host, but was unable to create the destination directory, check the directory permissions." *) msgBox "$rdiff_title: error" "Unexpected error."
remote_status=1 remote_status=failed;;
;;
255)
msgBox "$rdiff_title: error" "Failed to connect to $rdiff_user@$rdiff_host. Check hostname, username, and password. Also, make sure sshd is running on the destination host."
remote_status=1
;;
*)
msgBox "$rdiff_title: error" "Unexpected error."
remote_status=1
;;
esac esac
return
fi fi
fi fi
if [ $remote_status -ne 1 ] if [ "$remote_status" = "ok" ]; then
then
do_rdiff_con do_rdiff_con
fi fi
} }
do_rdiff_con() { do_rdiff_con() {
echo "Checking for local install of rdiff-backup"
require_packages rdiff-backup
echo "Testing to make sure destination has rdiff-backup installed and is compatible." echo "Testing to make sure destination has rdiff-backup installed and is compatible."
remote_result=`/usr/bin/rdiff-backup --test-server $rdiff_user@$rdiff_host::/ 2>&1 >&-` remote_result=`/usr/bin/rdiff-backup --test-server $rdiff_user@$rdiff_host::/ 2>&1 >&-`
if [ $? -ne 0 ] if [ $? -ne 0 ]; then
then
echo $remote_result | grep -q "command not found" echo $remote_result | grep -q "command not found"
if [ $? -eq 0 ] if [ $? -eq 0 ]; then
then if [ "$rdiff_user" = "root" ]; then
if [ "$rdiff_user" = "root" ]
then
booleanBox "install rdiff-backup?" "It seems like the remote machine does not have rdiff-backup installed, I can attempt to install rdiff-backup on the remote machine.\n\n\nDo you want me to attempt this now?" booleanBox "install rdiff-backup?" "It seems like the remote machine does not have rdiff-backup installed, I can attempt to install rdiff-backup on the remote machine.\n\n\nDo you want me to attempt this now?"
if [ $? = 0 ] if [ $? = 0 ]; then
then
ssh $rdiff_user@$rdiff_host 'apt-get install rdiff-backup' ssh $rdiff_user@$rdiff_host 'apt-get install rdiff-backup'
result=$? result=$?
echo "Hit return to continue." echo "Hit return to continue."
read read
case $result in case $result in
0) 0) msgBox "$rdiff_title: success" "Installation of rdiff-backup was a success!"
msgBox "$rdiff_title: success" "Installation of rdiff-backup was a success!" do_rdiff_con;;
do_rdiff_con 1) msgBox "$rdiff_title: error" "Connected successfully to $rdiff_user@$rdiff_host, but was unable to install the package for some reason.";;
;; 255) msgBox "$rdiff_title: error" "Failed to connect to $rdiff_user@$rdiff_host. Check hostname, username, and password. Also, make sure sshd is running on the destination host.";;
1) *) msgBox "$rdiff_title: error" "Unexpected error.";;
msgBox "$rdiff_title: error" "Connected successfully to $rdiff_user@$rdiff_host, but was unable to install the package for some reason."
;;
255)
msgBox "$rdiff_title: error" "Failed to connect to $rdiff_user@$rdiff_host. Check hostname, username, and password. Also, make sure sshd is running on the destination host."
;;
*)
msgBox "$rdiff_title: error" "Unexpected error."
;;
esac esac
return return
fi fi
else else
booleanBox "install rdiff-backup" "Please install rdiff-backup on the remote machine, this cannot be done automatically, as the remote user in your configuration is not root. \n\nIf you have installed rdiff-backup on the remote machine and you are getting this error, then there is a version incompatibility between that version and the local version.\n\nPlease resolve this problem and then try connecting again.\n\n\n\nTry connecting again?" booleanBox "install rdiff-backup" "Please install rdiff-backup on the remote machine, this cannot be done automatically, as the remote user in your configuration is not root. \n\nIf you have installed rdiff-backup on the remote machine and you are getting this error, then there is a version incompatibility between that version and the local version.\n\nPlease resolve this problem and then try connecting again.\n\n\n\nTry connecting again?"
if [ $? = 0 ] if [ $? = 0 ]; then
then
do_rdiff_con do_rdiff_con
else else
return return
@ -281,8 +244,7 @@ do_rdiff_con() {
fi fi
else else
msgBox "incompatible versions of rdiff-backup" "It looks like rdiff-backup is installed on the remote machine, but it may be an incompatible version with the one installed locally, or something else is amiss.\n\nPlease resolve this problem and then try connecting again.\n\n\nTry connecting again?" msgBox "incompatible versions of rdiff-backup" "It looks like rdiff-backup is installed on the remote machine, but it may be an incompatible version with the one installed locally, or something else is amiss.\n\nPlease resolve this problem and then try connecting again.\n\n\nTry connecting again?"
if [ $? = 0 ] if [ $? = 0 ]; then
then
do_rdiff_con do_rdiff_con
else else
return return
@ -308,21 +270,16 @@ do_rdiff_finish() {
type = local type = local
keep = $rdiff_keep keep = $rdiff_keep
EOF EOF
## includes ##
if [ "$host_or_vservers" == host -o "$host_or_vservers" == both ] if [ "$host_or_vservers" == host -o "$host_or_vservers" == both ]; then
then
set -o noglob set -o noglob
for ((i=0; i < ${#rdiff_includes[@]} ; i++)); do
for ((i=0; i < ${#rdiff_includes[@]} ; i++))
do
echo "include = ${rdiff_includes[$i]}" >> $next_filename echo "include = ${rdiff_includes[$i]}" >> $next_filename
done done
set +o noglob set +o noglob
fi fi
if [ "$host_or_vservers" == vservers -o "$host_or_vservers" == both ] if [ "$host_or_vservers" == vservers -o "$host_or_vservers" == both ]; then
then
cat >> $next_filename <<EOF cat >> $next_filename <<EOF
# #
# If vservers = yes in /etc/backupninja.conf then the following variables can # If vservers = yes in /etc/backupninja.conf then the following variables can
@ -341,7 +298,6 @@ EOF
# Vserver paths are derived from $VROOTDIR. # Vserver paths are derived from $VROOTDIR.
EOF EOF
set -o noglob set -o noglob
echo -e "vsnames = \"$selected_vservers\"\n" >> $next_filename echo -e "vsnames = \"$selected_vservers\"\n" >> $next_filename
for i in $rdiff_vsincludes; do for i in $rdiff_vsincludes; do
@ -350,10 +306,9 @@ EOF
set +o noglob set +o noglob
fi fi
# excludes ## excludes ##
set -o noglob
for ((i=0; i < ${#rdiff_excludes[@]} ; i++)) for ((i=0; i < ${#rdiff_excludes[@]} ; i++)); do
do
echo exclude = ${rdiff_excludes[$i]} >> $next_filename echo exclude = ${rdiff_excludes[$i]} >> $next_filename
done done
set +o noglob set +o noglob
@ -374,7 +329,6 @@ EOF
} }
rdiff_main_menu() { rdiff_main_menu() {
while true; do while true; do
srcitem="choose files to include & exclude $_src_done" srcitem="choose files to include & exclude $_src_done"
destitem="configure backup destination $_dest_done" destitem="configure backup destination $_dest_done"
@ -387,7 +341,6 @@ rdiff_main_menu() {
finish "finish and create config file" finish "finish and create config file"
[ $? = 0 ] || return [ $? = 0 ] || return
result="$REPLY" result="$REPLY"
case "$result" in case "$result" in
"src") do_rdiff_src;; "src") do_rdiff_src;;
"dest") do_rdiff_dest;; "dest") do_rdiff_dest;;
@ -402,12 +355,10 @@ rdiff_main_menu() {
fi fi
;; ;;
esac esac
done done
} }
rdiff_wizard() { rdiff_wizard() {
require_packages rdiff-backup
# Global variables # Global variables
rdiff_title="rdiff-backup action wizard" rdiff_title="rdiff-backup action wizard"