. fixed errors in create remote dir

. 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

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,22 +13,20 @@ 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++)); do
for ((i=0; i < ${#rdiff_includes[@]} ; i++)) formItem include ${rdiff_includes[$i]}
do done
formItem include ${rdiff_includes[$i]} formItem include
done formItem include
formItem include formItem include
formItem include formDisplay
formItem include [ $? = 0 ] || return
formDisplay unset rdiff_includes
[ $? = 0 ] || return rdiff_includes=($REPLY)
unset rdiff_includes
rdiff_includes="$REPLY"
done done
set +o noglob set +o noglob
} }
do_rdiff_vserver() { do_rdiff_vserver() {
@ -42,16 +42,15 @@ do_rdiff_vserver() {
formBegin "$rdiff_title - vsincludes (backup these directories from every vserver)" formBegin "$rdiff_title - vsincludes (backup these directories from every vserver)"
[ -z "$rdiff_vsincludes" ] && rdiff_vsincludes="$rdiff_default_includes" [ -z "$rdiff_vsincludes" ] && rdiff_vsincludes="$rdiff_default_includes"
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
} }
@ -79,223 +76,188 @@ do_rdiff_src() {
choose_host_or_vservers_or_both "$rdiff_title" choose_host_or_vservers_or_both "$rdiff_title"
[ $? = 0 ] || return 1 [ $? = 0 ] || return 1
case $host_or_vservers in case $host_or_vservers in
'host') 'host')
do_rdiff_host_includes do_rdiff_host_includes
[ $? = 0 ] || return 1 [ $? = 0 ] || return 1
;; ;;
'vservers') 'vservers')
do_rdiff_vserver do_rdiff_vserver
[ $? = 0 ] || return 1 [ $? = 0 ] || return 1
;; ;;
'both') 'both')
do_rdiff_host_includes do_rdiff_host_includes
[ $? = 0 ] || return 1 [ $? = 0 ] || return 1
do_rdiff_vserver do_rdiff_vserver
[ $? = 0 ] || return 1 [ $? = 0 ] || return 1
;; ;;
*) *)
return 1 return 1
;; ;;
esac esac
do_rdiff_excludes do_rdiff_excludes
[ $? = 0 ] || return 1 [ $? = 0 ] || return 1
_src_done="(DONE)" _src_done="(DONE)"
setDefault dest setDefault dest
} }
do_rdiff_dest() { do_rdiff_dest() {
declare -a tmp_array
local replyconverted
local thereply
set -o noglob set -o noglob
REPLY= REPLY=
while [ -z "$REPLY" -o -z "$rdiff_directory" -o -z "$rdiff_host" -o -z "$rdiff_user" ] while [ -z "$REPLY" -o -z "$rdiff_directory" -o -z "$rdiff_host" -o -z "$rdiff_user" ]
do do
formBegin "$rdiff_title - destination: last three items are required" formBegin "$rdiff_title - destination: last three items are required"
formItem "keep" "$rdiff_keep" formItem "keep" "$rdiff_keep"
formItem "dest_directory" "$rdiff_directory" formItem "dest_directory" "$rdiff_directory"
formItem "dest_host" "$rdiff_host" formItem "dest_host" "$rdiff_host"
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
_dest_done="(DONE)" _dest_done="(DONE)"
setDefault conn setDefault conn
} }
do_rdiff_ssh_con() {
IFS=$' \t\n'
if [ "$_dest_done" = "" ]; then
msgBox "$rdiff_title: error" "You must first configure the destination."
return
elif [ "$rdiff_user" = "" ]; then
msgBox "$rdiff_title: error" "You must first configure the destination user."
return
elif [ "$rdiff_host" = "" ]; then
msgBox "$rdiff_title: error" "You must first configure the destination host."
return
else
booleanBox "$rdiff_title" "This step will create a ssh key for the local root user with no passphrase (if one does not already exist), and attempt to copy root's public ssh key to authorized_keys file of $rdiff_user@$rdiff_host. This will allow the local root to make unattended backups to $rdiff_user@$rdiff_host.\n\n\nAre you sure you want to continue?"
[ $? = 0 ] || return
fi
if [ ! -f /root/.ssh/id_dsa.pub -a ! -f /root/.ssh/id_rsa.pub ]; then do_rdiff_ssh_con() {
echo "Creating local root's ssh key" local remote_status="ok"
ssh-keygen -t dsa -f /root/.ssh/id_dsa -N ""
echo "Done. hit return to continue" IFS=$' \t\n'
read if [ "$_dest_done" = "" ]; then
fi msgBox "$rdiff_title: error" "You must first configure the destination."
ssh -o PreferredAuthentications=publickey $rdiff_host -l $rdiff_user "exit" 2> /dev/null
if [ $? -ne 0 ]; then
echo "Copying root's public ssh key to authorized_keys of $rdiff_user@$rdiff_host. When prompted, specify the password for user $rdiff_user@$rdiff_host."
ssh-copy-id -i /root/.ssh/id_[rd]sa.pub $rdiff_user@$rdiff_host
if [ $? -ne 0 ]; then
echo "FAILED: Couldn't copy root's public ssh key to authorized_keys of $rdiff_user@$rdiff_host."
ssh $rdiff_user@$rdiff_host 'test -w .ssh || test -w .'
result=$?
echo "Hit return to continue."
read
case $result in
0 ) msgBox "$rdiff_title: error" "Directories are writable: Probably just a typo the first time." ;;
1 ) msgBox "$rdiff_title: error" "Connected successfully to $rdiff_user@$rdiff_host, but unable to write. Check ownership and modes of ~$rdiff_user on $rdiff_host." ;;
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
return return
else elif [ "$rdiff_user" = "" ]; then
msgBox "$rdiff_title: error" "You must first configure the destination user."
return
elif [ "$rdiff_host" = "" ]; then
msgBox "$rdiff_title: error" "You must first configure the destination host."
return
else
booleanBox "$rdiff_title" "This step will create a ssh key for the local root user with no passphrase (if one does not already exist), and attempt to copy root's public ssh key to authorized_keys file of $rdiff_user@$rdiff_host. This will allow the local root to make unattended backups to $rdiff_user@$rdiff_host.\n\n\nAre you sure you want to continue?"
[ $? = 0 ] || return
fi
if [ ! -f /root/.ssh/id_dsa.pub -a ! -f /root/.ssh/id_rsa.pub ]; then
echo "Creating local root's ssh key"
ssh-keygen -t dsa -f /root/.ssh/id_dsa -N ""
echo "Done. hit return to continue" echo "Done. hit return to continue"
read read
fi fi
else
echo "root@localhost is already in authorized_keys of $rdiff_user@$rdiff_host."
echo "Hit return to continue."
read
fi
# 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"
ssh $rdiff_user@$rdiff_host "test -d ${rdiff_directory}"
if [ $? -eq 0 ]
then
ssh $rdiff_user@$rdiff_host "test -w $rdiff_directory"
if [ $? -ne 0 ]
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."
remote_status=1
else
remote_status=0
fi
else
booleanBox "Remote directory does not exist" "The destination backup directory does not exist, do you want me to create it for you?"
if [ $? = 0 ]
then
ssh $rdiff_user@$rdiff_host "mkdir -p ${rdiff_directory}"
result=$?
echo "Hit return to continue."
read
case $result in
0)
msgBox "$rdiff_title: success" "Creation of the remote destination directory was a success!"
remote_status=0
;;
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=1
;;
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
return
fi
fi
if [ $remote_status -ne 1 ] ssh -o PreferredAuthentications=publickey $rdiff_host -l $rdiff_user "exit" 2> /dev/null
then if [ $? -ne 0 ]; then
do_rdiff_con echo "Copying root's public ssh key to authorized_keys of $rdiff_user@$rdiff_host. When prompted, specify the password for user $rdiff_user@$rdiff_host."
fi ssh-copy-id -i /root/.ssh/id_[rd]sa.pub $rdiff_user@$rdiff_host
if [ $? -ne 0 ]; then
echo "FAILED: Couldn't copy root's public ssh key to authorized_keys of $rdiff_user@$rdiff_host."
ssh $rdiff_user@$rdiff_host 'test -w .ssh || test -w .'
result=$?
echo "Hit return to continue."
read
case $result in
0 ) msgBox "$rdiff_title: error" "Directories are writable: Probably just a typo the first time." ;;
1 ) msgBox "$rdiff_title: error" "Connected successfully to $rdiff_user@$rdiff_host, but unable to write. Check ownership and modes of ~$rdiff_user on $rdiff_host." ;;
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
return
else
echo "Done. hit return to continue"
read
fi
else
echo "root@localhost is already in authorized_keys of $rdiff_user@$rdiff_host."
echo "Hit return to continue."
read
fi
# 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"
ssh $rdiff_user@$rdiff_host "test -d ${rdiff_directory}"
if [ $? = 0 ]; then
ssh $rdiff_user@$rdiff_host "test -w $rdiff_directory"
if [ $? != 0 ]; 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."
remote_status=failed
fi
else
booleanBox "Remote directory does not exist" "The destination backup directory does not exist, do you want me to create it for you?"
if [ $? = 0 ]; then
ssh $rdiff_user@$rdiff_host "mkdir -p ${rdiff_directory}"
result=$?
case $result in
0) 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=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=failed;;
*) msgBox "$rdiff_title: error" "Unexpected error."
remote_status=failed;;
esac
fi
fi
if [ "$remote_status" = "ok" ]; then
do_rdiff_con
fi
} }
do_rdiff_con() { do_rdiff_con() {
echo "Testing to make sure destination has rdiff-backup installed and is compatible." echo "Checking for local install of rdiff-backup"
remote_result=`/usr/bin/rdiff-backup --test-server $rdiff_user@$rdiff_host::/ 2>&1 >&-` require_packages rdiff-backup
if [ $? -ne 0 ]
then echo "Testing to make sure destination has rdiff-backup installed and is compatible."
echo $remote_result | grep -q "command not found" remote_result=`/usr/bin/rdiff-backup --test-server $rdiff_user@$rdiff_host::/ 2>&1 >&-`
if [ $? -eq 0 ] if [ $? -ne 0 ]; then
then echo $remote_result | grep -q "command not found"
if [ "$rdiff_user" = "root" ] if [ $? -eq 0 ]; then
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) msgBox "$rdiff_title: success" "Installation of rdiff-backup was a success!"
0) do_rdiff_con;;
msgBox "$rdiff_title: success" "Installation of rdiff-backup was a success!" 1) msgBox "$rdiff_title: error" "Connected successfully to $rdiff_user@$rdiff_host, but was unable to install the package for some reason.";;
do_rdiff_con 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.";;
1) esac
msgBox "$rdiff_title: error" "Connected successfully to $rdiff_user@$rdiff_host, but was unable to install the package for some reason." return
;; fi
255) else
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." 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 ]; then
*) do_rdiff_con
msgBox "$rdiff_title: error" "Unexpected error." else
;; return
esac fi
return 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?"
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 ]; then
if [ $? = 0 ] do_rdiff_con
then else
do_rdiff_con return
else fi
return fi
fi
fi
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?"
if [ $? = 0 ]
then
do_rdiff_con
else
return
fi
fi
else else
echo "SUCCESS: Everything looks good!" echo "SUCCESS: Everything looks good!"
echo "Hit return to continue." echo "Hit return to continue."
read read
fi fi
_con_done="(DONE)" _con_done="(DONE)"
setDefault finish setDefault finish
} }
do_rdiff_finish() { do_rdiff_finish() {
@ -308,22 +270,17 @@ 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
# be used: # be used:
@ -341,23 +298,21 @@ 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 echo "vsinclude = $i" >> $next_filename
echo "vsinclude = $i" >> $next_filename done
done 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
cat >> $next_filename <<EOF cat >> $next_filename <<EOF
###################################################### ######################################################
## destination section ## destination section
@ -374,59 +329,55 @@ 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" conitem="set up ssh keys and test remote connection $_con_done"
conitem="set up ssh keys and test remote connection $_con_done" advitem="edit advanced settings $_adv_done"
advitem="edit advanced settings $_adv_done" menuBox "$rdiff_title" "choose a step:" \
menuBox "$rdiff_title" "choose a step:" \ src "$srcitem" \
src "$srcitem" \ dest "$destitem" \
dest "$destitem" \ conn "$conitem" \
conn "$conitem" \ finish "finish and create config file"
finish "finish and create config file" [ $? = 0 ] || return
[ $? = 0 ] || return result="$REPLY"
result="$REPLY" case "$result" in
"src") do_rdiff_src;;
case "$result" in "dest") do_rdiff_dest;;
"src") do_rdiff_src;; "conn") do_rdiff_ssh_con;;
"dest") do_rdiff_dest;; "adv") do_rdiff_adv;;
"conn") do_rdiff_ssh_con;; "finish")
"adv") do_rdiff_adv;; if [[ "$_con_done$_dest_done$_src_done" != "(DONE)(DONE)(DONE)" ]]; then
"finish") msgBox "$rdiff_title" "You cannot create the configuration file until the other steps are completed."
if [[ "$_con_done$_dest_done$_src_done" != "(DONE)(DONE)(DONE)" ]]; then else
msgBox "$rdiff_title" "You cannot create the configuration file until the other steps are completed." do_rdiff_finish
else return
do_rdiff_finish fi
return ;;
fi esac
;; done
esac
done
} }
rdiff_wizard() { rdiff_wizard() {
require_packages rdiff-backup
# Global variables
rdiff_title="rdiff-backup action wizard"
_src_done=
_dest_done=
_con_done=
_adv_done=
rdiff_keep=60D
rdiff_directory=/backup/`hostname`
rdiff_user=
rdiff_host=
# Global variables whose '*' shall not be expanded
set -o noglob
rdiff_includes=(/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*)
rdiff_excludes=(/home/*/.gnupg)
rdiff_vsincludes=
set +o noglob
# Global variables rdiff_main_menu
rdiff_title="rdiff-backup action wizard"
_src_done=
_dest_done=
_con_done=
_adv_done=
rdiff_keep=60D
rdiff_directory=/backup/`hostname`
rdiff_user=
rdiff_host=
# Global variables whose '*' shall not be expanded
set -o noglob
rdiff_includes=(/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*)
rdiff_excludes=(/home/*/.gnupg)
rdiff_vsincludes=
set +o noglob
rdiff_main_menu
} }