aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/backup5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/backup b/scripts/backup
index f93da22..361ad8d 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -37,4 +37,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