@@ -56,6 +56,7 @@ prepareDirectories() {
5656 rm -rf /home/zulip/uploads
5757 ln -sfT " $DATA_DIR /uploads" /home/zulip/uploads
5858 chown zulip:zulip -R " $DATA_DIR /uploads"
59+ chown zulip:zulip -R " $DATA_DIR /backups"
5960 # Link settings folder
6061 if [ " $LINK_SETTINGS_TO_DATA " = " True" ] || [ " $LINK_SETTINGS_TO_DATA " = " true" ]; then
6162 # Create settings directories
@@ -440,21 +441,11 @@ appManagePy() {
440441 exec su zulip -c " /home/zulip/deployments/current/manage.py $( printf ' %q ' " $COMMAND " " $@ " ) "
441442}
442443appBackup () {
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 "
452444 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 "
458449}
459450appRestore () {
460451 echo " Starting restore process ..."
@@ -494,9 +485,7 @@ appRestore() {
494485 done
495486 echo " !! WARNING !! Starting restore process ... !! WARNING !!"
496487 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 "
500489 echo " Restore process succeeded. Exiting."
501490 exit 0
502491}
0 commit comments