aboutsummaryrefslogtreecommitdiff
path: root/scripts/backup
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/backup')
-rw-r--r--scripts/backup4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/backup b/scripts/backup
index e4a5bba..2e26381 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -43,5 +43,9 @@ sudo su - postgres <<COMMANDS
pg_dump --role=mastodon -U postgres --no-password mastodon_production > mastodon_db.sql
COMMANDS
ynh_backup "/var/lib/postgresql/${app}_db.sql" "${app}_db.sql"
+<<<<<<< HEAD
+#rm /var/lib/postgresql/mastodon_db.sql
+=======
# Fix backup fail on yunohost 2.6
#ynh_secure_remove /var/lib/postgresql/mastodon_db.sql
+>>>>>>> refs/remotes/YunoHost-Apps/master