Skip to content

Commit 563a9d8

Browse files
authored
Avoid blocking v-backup-user because of already dumped db
Well, in one db.conf I found duplicated entry for the same database. root@btvc:~# cat /usr/local/vesta/data/users/btvc2011/db.conf DB='btvc2011_cart' DBUSER='btvc2011_9091dn' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='1' SUSPENDED='no' TIME='' DATE='' DB='btvc2011_cart' DBUSER='btvc2011_admin' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='' DATE='' DB='btvc2011_cart' DBUSER='btvc2011_david' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='' DATE='' DB='btvc2011_cart' DBUSER='btvc2011_djn' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='' DATE='' DB='btvc2011_cart' DBUSER='btvc2011_jd' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='' DATE='' DB='btvc2011_cart' DBUSER='btvc2011_oscar' MD5='*' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='' DATE='' Obviously different users has access to the same database. I know that this is impossible to create in Vesta. But @Skamasle thirt-party script for importing cPanels backup obviously CAN do that... and many people use that cPanel importer. This fix will avoid databases that are already dumped. Without this fix backup script get stuck on stdin waiting for: gzip: /backup/tmp.4YlV9Yr4m5/db/btvc2011_cart/btvc2011_cart.mysql.sql.gz already exists; do you wish to overwrite (y or n)?
1 parent 0e48458 commit 563a9d8

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

bin/v-backup-user

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -393,13 +393,15 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then
393393

394394
dump="$tmpdir/db/$database/$database.$TYPE.sql"
395395
grants="$tmpdir/db/$database/conf/$database.$TYPE.$DBUSER"
396-
case $TYPE in
397-
mysql) dump_mysql_database ;;
398-
pgsql) dump_pgsql_database ;;
399-
esac
400-
401-
# Compress dump
402-
gzip -$BACKUP_GZIP $dump
396+
if [ ! -f "$dump" ]; then
397+
case $TYPE in
398+
mysql) dump_mysql_database ;;
399+
pgsql) dump_pgsql_database ;;
400+
esac
401+
402+
# Compress dump
403+
gzip -$BACKUP_GZIP $dump
404+
fi
403405
done
404406

405407
# Print total

0 commit comments

Comments
 (0)