diff options
| author | nemsia <nemsia@nemsia.org> | 2017-07-08 21:34:15 +0200 |
|---|---|---|
| committer | nemsia <nemsia@nemsia.org> | 2017-07-08 21:34:15 +0200 |
| commit | 7b7070f970a0c2dc888a26308977ec94ea64b2e0 (patch) | |
| tree | 63fe6bd83b5e451b54ddf90e11deba5cc953d464 | |
| parent | 061bb38b0081770cb5e70cc8545321f7f5629c25 (diff) | |
| parent | 7cd6bc84ac242c38b719077a7ad5fcf23497421c (diff) | |
| download | mastodon_ynh-7b7070f970a0c2dc888a26308977ec94ea64b2e0.tar.gz mastodon_ynh-7b7070f970a0c2dc888a26308977ec94ea64b2e0.tar.bz2 mastodon_ynh-7b7070f970a0c2dc888a26308977ec94ea64b2e0.zip | |
Merge remote-tracking branch 'refs/remotes/YunoHost-Apps/master'
| -rw-r--r-- | manifest.json | 2 | ||||
| -rw-r--r-- | scripts/backup | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/manifest.json b/manifest.json index b096d4f..ccf281d 100644 --- a/manifest.json +++ b/manifest.json @@ -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": { 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 |