From 72d59138ceeff654c997844a986a5a3b715156d9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 4 May 2022 06:25:06 +0000 Subject: [PATCH 1/4] Upgrade to v3.5.2 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 818abf0..2d07bb6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v3.5.1.tar.gz -SOURCE_SUM=3162b62fd6f7cfe1c3ec1c4005386adbb19ddd4975fce9dd2012b04e39c90767 +SOURCE_URL=https://github.com/tootsuite/mastodon/archive/refs/tags/v3.5.2.tar.gz +SOURCE_SUM=2e954ae10c42b2d814d070bd6b24d6528f0ac8338a9f979860bce43a18fef143 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index ab59fde..43f5cb6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network", "fr": "Réseau social libre et fédéré" }, - "version": "3.5.1~ynh2", + "version": "3.5.2~ynh1", "url": "https://github.com/mastodon/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From 91f9f43d9ed63941a906f11596932eb8699f20b9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 4 May 2022 06:25:10 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4a47c04..119aba9 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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.5.1~ynh2 +**Shipped version:** 3.5.2~ynh1 **Demo:** https://joinmastodon.org/ diff --git a/README_fr.md b/README_fr.md index 749c104..668c995 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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.5.1~ynh2 +**Version incluse :** 3.5.2~ynh1 **Démo :** https://joinmastodon.org/ From d0975af0bb3bcfe70db211681c1dad04a37e01bf Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 9 May 2022 19:25:44 +0200 Subject: [PATCH 3/4] less warnings --- scripts/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index bb99a57..2b7a807 100644 --- a/scripts/install +++ b/scripts/install @@ -93,7 +93,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path #================================================= ynh_script_progression --message="Creating a PostgreSQL database..." -ynh_psql_test_if_first_run + # Create PostgreSQL database db_name=$(ynh_sanitize_dbid --db_name="${app}_production") db_user=$(ynh_sanitize_dbid --db_name=$app) @@ -101,6 +101,7 @@ db_pwd=$(ynh_string_random --length=30) ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_app_setting_set --app=$app --key=db_user --value=$db_user ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd +ynh_psql_test_if_first_run ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_psql_execute_as_root --sql="ALTER USER $db_user CREATEDB;" From 743be37862999dec370ae77506efcbba4ec68872 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 9 May 2022 19:25:53 +0200 Subject: [PATCH 4/4] ynh_exec_warn_less --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3b8290c..9aee01c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -208,8 +208,8 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." -ynh_install_app_dependencies $pkg_dependencies -ynh_install_nodejs --nodejs_version=$NODEJS_VERSION +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_ruby --ruby_version=$RUBY_VERSION