github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-11 23:56:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better fix for FTP backup without folder name

Browse source
This commit is contained in:
dpeca 2017-04-22 02:22:23 +02:00
parent 335b5fe41e
commit e022c6507b
2 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bin/v-add-backup-host
View file

@ -122,8 +122,12 @@ if [ "$type" = 'ftp' ]; then
fi fi
# Checking write permissions # Checking write permissions
ftpc "mkdir $path" > /dev/null 2>&1 if [ -z $path ]; then
ftmpdir="$path/vst.bK76A9SUkt" ftmpdir="vst.bK76A9SUkt"
else
ftpc "mkdir $path" > /dev/null 2>&1
ftmpdir="$path/vst.bK76A9SUkt"
fi
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"

30
bin/v-backup-user
View file

@ -557,10 +557,6 @@ ftp_backup() {
check_result "$E_PARSING" "$error" check_result "$E_PARSING" "$error"
fi fi
if [ -z $BPATH ]; then
BPATH="/";
fi
# Debug info # Debug info
echo -e "$(date "+%F %T") Remote: ftp://$HOST$BPATH/$user.$date.tar" echo -e "$(date "+%F %T") Remote: ftp://$HOST$BPATH/$user.$date.tar"
@ -577,8 +573,12 @@ ftp_backup() {
fi fi
# Check ftp permissions # Check ftp permissions
ftpc "mkdir $BPATH" > /dev/null 2>&1 if [ -z $BPATH ]; then
ftmpdir="$BPATH/vst.bK76A9SUkt" ftmpdir="vst.bK76A9SUkt"
else
ftpc "mkdir $BPATH" > /dev/null 2>&1
ftmpdir="$BPATH/vst.bK76A9SUkt"
fi
ftpc "mkdir $ftmpdir" "rm $ftmpdir" 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
@ -591,7 +591,11 @@ ftp_backup() {
fi fi
# Checking retention # Checking retention
backup_list=$(ftpc "cd $BPATH" "ls" |awk '{print $9}' |grep "^$user\.") if [ -z $BPATH ]; then
backup_list=$(ftpc "ls" |awk '{print $9}' |grep "^$user\.")
else
backup_list=$(ftpc "cd $BPATH" "ls" |awk '{print $9}' |grep "^$user\.")
fi
backups_count=$(echo "$backup_list" |wc -l) backups_count=$(echo "$backup_list" |wc -l)
if [ "$backups_count" -ge "$BACKUPS" ]; then if [ "$backups_count" -ge "$BACKUPS" ]; then
backups_rm_number=$((backups_count - BACKUPS + 1)) backups_rm_number=$((backups_count - BACKUPS + 1))
@ -599,14 +603,22 @@ ftp_backup() {
backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//") backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//")
echo -e "$(date "+%F %T") Rotated ftp backup: $backup_date" |\ echo -e "$(date "+%F %T") Rotated ftp backup: $backup_date" |\
tee -a $BACKUP/$user.log tee -a $BACKUP/$user.log
ftpc "cd $BPATH" "delete $backup" if [ -z $BPATH ]; then
ftpc "delete $backup"
else
ftpc "cd $BPATH" "delete $backup"
fi
done done
fi fi
# Uploading backup archive # Uploading backup archive
if [ "$localbackup" = 'yes' ]; then if [ "$localbackup" = 'yes' ]; then
cd $BACKUP cd $BACKUP
ftpc "cd $BPATH" "put $user.$date.tar" if [ -z $BPATH ]; then
ftpc "put $user.$date.tar"
else
ftpc "cd $BPATH" "put $user.$date.tar"
fi
else else
cd $tmpdir cd $tmpdir
tar -cf $BACKUP/$user.$date.tar . tar -cf $BACKUP/$user.$date.tar .