aboutsummaryrefslogtreecommitdiff
path: root/scripts/backup
diff options
context:
space:
mode:
authornemsia <nemsia@nemsia.org>2017-07-24 01:15:15 +0200
committernemsia <nemsia@nemsia.org>2017-07-24 01:15:15 +0200
commit03074519069383688f69ee7f0dc619b067d9917f (patch)
tree9de9fb27a293344d15882edefb787005dcb207f5 /scripts/backup
parent1f948e706af0dc07a1befc26ed0a117af0d3c2b0 (diff)
downloadmastodon_ynh-03074519069383688f69ee7f0dc619b067d9917f.tar.gz
mastodon_ynh-03074519069383688f69ee7f0dc619b067d9917f.tar.bz2
mastodon_ynh-03074519069383688f69ee7f0dc619b067d9917f.zip
Add libicu-dev and libidn11-dev
Diffstat (limited to 'scripts/backup')
-rw-r--r--scripts/backup4
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/backup b/scripts/backup
index 2e26381..e4a5bba 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -43,9 +43,5 @@ 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