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

Merge pull request #239 from YunoHost-Apps/testing

Upgrade 3.2.1
This commit is contained in:
yalh76 2020-10-31 21:43:23 +01:00 committed by GitHub
commit cd9e7f8585
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 34 deletions

View file

@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
## Overview
Mastodon is a free, open-source microblogging social network. It is a decentralized alternative to commercial platforms like Twitter and avoids the risks of a single company monopolizing your communication for commercial purposes.
**Shipped version:** 3.2.0 (3.1.2 on Jessie)
**Shipped version:** 3.2.1
## Important points to read before installing

View file

@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
## Vue d'ensemble
Mastodon est un réseau social de microblog auto-hébergé et open source. C'est une alternative décentralisée aux plates-formes commerciales comme Twitter. Mastodon évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales.
**Version incluse:** 3.2.0 (3.1.2 on Jessie)
**Version incluse:** 3.2.1
## Points importants à lire avant l'installation

View file

@ -19,6 +19,8 @@
upgrade=1 from_commit=6b30109fc986d83166b1805ec3ad7e28200e3743
# 3.1.2~ynh4
upgrade=1 from_commit=d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef
# 3.2.0~ynh1
upgrade=1 from_commit=bde14cc4496445fdfed4616ac44fc9527c8369fd
backup_restore=1
multi_instance=1
# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.
@ -38,3 +40,5 @@ Notification=all
name=3.1.2~ynh3
; commit=d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef
name=3.1.2~ynh4
; commit=bde14cc4496445fdfed4616ac44fc9527c8369fd
name=3.2.0~ynh1

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.2.0.tar.gz
SOURCE_SUM=7ab99ccc6d6ce2ac2d5aea82a2fc057dd357126cb572e4fb39531931dc078904
SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.2.1.tar.gz
SOURCE_SUM=429dbe1166948e2863dd97b7d5458d18887e7a75b7ff5005cfa50828f9c7b9e2
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true

View file

@ -1,6 +0,0 @@
SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.1.2.tar.gz
SOURCE_SUM=c12fd8c1b426861825d37d2eab1d6356be05b2b321eae0c1b87f80fcc11b0da7
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=

View file

@ -6,7 +6,7 @@
"en": "A libre and federated social network.",
"fr": "Un réseau social libre et fédéré."
},
"version": "3.2.0~ynh1",
"version": "3.2.1~ynh1",
"url": "https://github.com/tootsuite/mastodon",
"license": "AGPL-3.0-or-later",
"maintainer": [
@ -23,7 +23,7 @@
}
],
"requirements": {
"yunohost": ">= 3.8.2"
"yunohost": ">= 4.0"
},
"multi_instance": true,
"services": [

View file

@ -102,18 +102,7 @@ ynh_script_progression --message="Setting up source files..."
ynh_app_setting_set --app=$app --key=final_path --value=$final_path
# Download, check integrity, uncompress and patch the source from app.src
mkdir $final_path
if [ "$(lsb_release --codename --short)" = "buster" ]; then
ynh_setup_source --dest_dir="$final_path/live"
else
ynh_script_progression --message="Setting up source files..."
ynh_setup_source --dest_dir="$final_path/live" --source_id=jessie
# Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292
ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock"
fi
ynh_setup_source --dest_dir="$final_path/live"
#=================================================
# NGINX CONFIGURATION

View file

@ -183,16 +183,8 @@ then
fi
rsync -a "$config" "$tmpdir/."
ynh_secure_remove --file="$final_path/live"
if [ "$(lsb_release --codename --short)" = "buster" ]; then
ynh_setup_source --dest_dir="$final_path/live"
else
ynh_script_progression --message="Setting up source files..."
ynh_setup_source --dest_dir="$final_path/live" --source_id=jessie
# Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292
ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock"
fi
ynh_setup_source --dest_dir="$final_path/live"
if [ -d "$final_path/system.tmp" ]; then
mv --verbose --no-target-directory "$final_path/system.tmp" "$final_path/live/public/system"