1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mastodon_ynh.git synced 2024-09-03 19:46:02 +02:00

Merge remote-tracking branch 'refs/remotes/YunoHost-Apps/master'

This commit is contained in:
nemsia 2017-07-08 21:34:15 +02:00
commit 7b7070f970
2 changed files with 6 additions and 1 deletions

View file

@ -9,7 +9,7 @@
"en": "Mastodon is a free, open-source social network.",
"fr": "Mastodon est un réseau social gratuit et open source."
},
"version": "1.4.1",
"version": "1.4.7",
"url": "https://github.com/tootsuite/mastodon",
"license": "AGPL v3.0",
"maintainer": {

View file

@ -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