@@ -56,6 +56,7 @@ prepareDirectories() {
56
56
rm -rf /home/zulip/uploads
57
57
ln -sfT " $DATA_DIR /uploads" /home/zulip/uploads
58
58
chown zulip:zulip -R " $DATA_DIR /uploads"
59
+ chown zulip:zulip -R " $DATA_DIR /backups"
59
60
# Link settings folder
60
61
if [ " $LINK_SETTINGS_TO_DATA " = " True" ] || [ " $LINK_SETTINGS_TO_DATA " = " true" ]; then
61
62
# Create settings directories
@@ -440,21 +441,11 @@ appManagePy() {
440
441
exec su zulip -c " /home/zulip/deployments/current/manage.py $( printf ' %q ' " $COMMAND " " $@ " ) "
441
442
}
442
443
appBackup () {
443
- echo " Starting backup process ..."
444
- if [ -d " /tmp/backup-$( date " %D-%H-%M-%S" ) " ]; then
445
- echo " Temporary backup folder for \" $( date " %D-%H-%M-%S" ) \" already exists. Aborting."
446
- echo " Backup process failed. Exiting."
447
- exit 1
448
- fi
449
- local BACKUP_FOLDER
450
- BACKUP_FOLDER=" /tmp/backup-$( date " %D-%H-%M-%S" ) "
451
- mkdir -p " $BACKUP_FOLDER "
452
444
waitingForDatabase
453
- pg_dump -h " $DB_HOST " -p " $DB_HOST_PORT " -U " $DB_USER " " $DB_NAME " > " $BACKUP_FOLDER /database-postgres.sql"
454
- tar -zcvf " $DATA_DIR /backups/backup-$( date " %D-%H-%M-%S" ) .tar.gz" " $BACKUP_FOLDER /"
455
- rm -r " ${BACKUP_FOLDER:? } /"
456
- echo " Backup process succeeded."
457
- exit 0
445
+ echo " Starting backup process"
446
+ local BACKUP_FOLDER
447
+ BACKUP_FOLDER=" /data/backups/backup-$( date " +%Y-%b-%d-%H-%M-%S" ) .tar.gz"
448
+ exec su zulip -c " /home/zulip/deployments/current/manage.py backup --output $BACKUP_FOLDER "
458
449
}
459
450
appRestore () {
460
451
echo " Starting restore process ..."
@@ -494,9 +485,7 @@ appRestore() {
494
485
done
495
486
echo " !! WARNING !! Starting restore process ... !! WARNING !!"
496
487
waitingForDatabase
497
- tar -zxvf " $DATA_DIR /backups/$BACKUP_FILE " -C /tmp
498
- psql -h " $DB_HOST " -p " $DB_HOST_PORT " -U " $DB_USER " " $DB_NAME " < " /tmp/$( basename " $BACKUP_FILE " | cut -d. -f1) /database-postgres.sql"
499
- rm -r " /tmp/$( basename | cut -d. -f1) /"
488
+ /home/zulip/deployments/current/scripts/setup/restore-backup " $DATA_DIR /backups/$BACKUP_FILE "
500
489
echo " Restore process succeeded. Exiting."
501
490
exit 0
502
491
}
0 commit comments