github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for ftp backup on RHEL5 and Ubuntu

Browse source
This commit is contained in:
Serghey Rodin 2013-10-12 19:35:06 +03:00
commit 735067aa1a
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bin/v-add-backup-ftp-host
View file

@ -23,7 +23,7 @@ source $VESTA/conf/vesta.conf
# Defining ftp command function # Defining ftp command function
ftpc() { ftpc() {
ftp -n $host $ftp_port <<EOF ftp -p -n $host $ftp_port <<EOF
quote USER $ftp_user quote USER $ftp_user
quote PASS $ftp_password quote PASS $ftp_password
binary binary
@ -48,8 +48,9 @@ validate_format 'host' 'ftp_user' 'ftp_password'
#----------------------------------------------------------# #----------------------------------------------------------#
# Checking network connection # Checking network connection
ftp_connect=$(ftpc) fconn=$(ftpc)
if [ ! -z "$(echo $ftp_connect |grep -i -e error -e 'not connected')" ]; then ferror=$(echo $fconn |grep -i -e failed -e error -e "Can't" -e "not conn")
if [ ! -z "$ferror" ]; then
echo "Error: can't login to ftp" echo "Error: can't login to ftp"
log_event "$E_CONNECT" "$EVENT" log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT exit $E_CONNECT
@ -57,7 +58,7 @@ fi
# Checking write permissions # Checking write permissions
ftpc "mkdir $ftp_path" > /dev/null 2>&1 ftpc "mkdir $ftp_path" > /dev/null 2>&1
ftmpdir=$(mktemp -u -p "$ftp_path") ftmpdir="$ftp_path/vst.bK76A9SUkt"
ftp_result=$(ftpc "mkdir $ftmpdir" "rm $ftmpdir"|grep -v Trying) ftp_result=$(ftpc "mkdir $ftmpdir" "rm $ftmpdir"|grep -v Trying)
if [ ! -z "$ftp_result" ] ; then if [ ! -z "$ftp_result" ] ; then
echo "$ftp_result" echo "$ftp_result"

10
bin/v-backup-user
View file

@ -509,7 +509,7 @@ local_backup(){
# Defining ftp command function # Defining ftp command function
ftpc() { ftpc() {
/usr/bin/ftp -n $HOST $PORT <<EOF /usr/bin/ftp -p -n $HOST $PORT <<EOF
quote USER $USERNAME quote USER $USERNAME
quote PASS $PASSWORD quote PASS $PASSWORD
binary binary
@ -556,8 +556,9 @@ ftp_backup() {
echo -e "$(date "+%F %T") FTP ftp://$HOST$BPATH/$user.$DATE.tar" echo -e "$(date "+%F %T") FTP ftp://$HOST$BPATH/$user.$DATE.tar"
# Checking ftp connection # Checking ftp connection
ftp_connect=$(ftpc) fconn=$(ftpc)
if [ ! -z "$(echo $ftp_connect |grep -i -e error -e 'not conn')" ]; then ferror=$(echo $fconn |grep -i -e failed -e error -e "Can't" -e "not conn")
if [ ! -z "$ferror" ]; then
rm -rf $tmpdir rm -rf $tmpdir
echo "Can't login to ftp://$USERNAME@$HOST" |\ echo "Can't login to ftp://$USERNAME@$HOST" |\
$send_mail -s "$subj" $email $send_mail -s "$subj" $email
@ -569,7 +570,8 @@ ftp_backup() {
# Check ftp permissions # Check ftp permissions
ftpc "mkdir $BPATH" > /dev/null 2>&1 ftpc "mkdir $BPATH" > /dev/null 2>&1
ftmpdir=$(mktemp -u -p "$BPATH") ftmpdir="$BPATH/vst.bK76A9SUkt"
ftpc "mkdir $ftmpdir" "rm $ftmpdir"
ftp_result=$(ftpc "mkdir $ftmpdir" "rm $ftmpdir" |grep -v Trying) ftp_result=$(ftpc "mkdir $ftmpdir" "rm $ftmpdir" |grep -v Trying)
if [ ! -z "$ftp_result" ] ; then if [ ! -z "$ftp_result" ] ; then
rm -rf $tmpdir rm -rf $tmpdir