From 9a569a090ab333e90a1f1553fc4d2422243f999b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 10 Apr 2022 06:23:02 +0000 Subject: [PATCH 1/6] Upgrade to v2022.04.08 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 105945e..7c83249 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/3381a0e6e050438680f38c97ac9332045b8d66f4.tar.gz -SOURCE_SUM=c3f76d504013963c2bff6336bfd4a2ec03c8619efb656ffe9597676770d7e973 +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/9309c53d21df806d57dd59dbc59a807d2f8b8b11.tar.gz +SOURCE_SUM=b4a572be43409cc194d4bd1ca855f55eaf87da8137b90ff69c072f6d9857a1d8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=3381a0e6e050438680f38c97ac9332045b8d66f4.tar.gz +SOURCE_FILENAME=9309c53d21df806d57dd59dbc59a807d2f8b8b11.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 6fbe9c2..f83a0e7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2022.03.31~ynh1", + "version": "2022.04.08~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "free", From f8b5d6b84d5e40211a191e542d5087723aaa4371 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 10 Apr 2022 06:23:07 +0000 Subject: [PATCH 2/6] 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 ca4bdf0..a2638d1 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2022.03.31~ynh1 +**Shipped version:** 2022.04.08~ynh1 diff --git a/README_fr.md b/README_fr.md index 54310f8..28a8e3d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -38,7 +38,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2022.03.31~ynh1 +**Version incluse :** 2022.04.08~ynh1 From 76e1f06adbf85dcc89eafb8a41c3b730c17ca5cf Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 17 Apr 2022 06:23:12 +0000 Subject: [PATCH 3/6] Upgrade to v2022.04.16 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 7c83249..95b70c5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/9309c53d21df806d57dd59dbc59a807d2f8b8b11.tar.gz -SOURCE_SUM=b4a572be43409cc194d4bd1ca855f55eaf87da8137b90ff69c072f6d9857a1d8 +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/ec4a8d81b141c46a6fa967f8416724d0162cd6c7.tar.gz +SOURCE_SUM=e4bf11cbd453998ff0a5711d2034955f06bd463e651473a6622abd50c53adb3d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=9309c53d21df806d57dd59dbc59a807d2f8b8b11.tar.gz +SOURCE_FILENAME=ec4a8d81b141c46a6fa967f8416724d0162cd6c7.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index f83a0e7..e93415c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2022.04.08~ynh1", + "version": "2022.04.16~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "free", From 7c69e1f72c48c6e676bc296fe11300abe2098096 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 17 Apr 2022 06:23:17 +0000 Subject: [PATCH 4/6] 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 a2638d1..97cf89f 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2022.04.08~ynh1 +**Shipped version:** 2022.04.16~ynh1 diff --git a/README_fr.md b/README_fr.md index 28a8e3d..d406e50 100644 --- a/README_fr.md +++ b/README_fr.md @@ -38,7 +38,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2022.04.08~ynh1 +**Version incluse :** 2022.04.16~ynh1 From 2bcadc092922463000642f4dcacc8121a9e5bb06 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Mon, 18 Apr 2022 11:49:05 +0000 Subject: [PATCH 5/6] Fix weights --- scripts/install | 12 ++++++------ scripts/remove | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index 8e6dec7..8825e36 100644 --- a/scripts/install +++ b/scripts/install @@ -93,7 +93,7 @@ ynh_app_setting_set --app=$app --key=port_stream --value=$port_stream #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=60 +ynh_script_progression --message="Installing dependencies..." --weight=10 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION @@ -111,7 +111,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path #================================================= # CREATE A POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Creating a PostgreSQL database..." --weight=14 +ynh_script_progression --message="Creating a PostgreSQL database..." --weight=3 ynh_psql_test_if_first_run # Create PostgreSQL database @@ -127,7 +127,7 @@ ynh_psql_execute_as_root --sql="ALTER USER $db_user CREATEDB;" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=5 +ynh_script_progression --message="Setting up source files..." --weight=3 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src @@ -166,7 +166,7 @@ ynh_add_swap --size=$swap_needed #================================================= # INSTALLING RUBY AND BUNDLER #================================================= -ynh_script_progression --message="Installing Ruby dependencies..." --weight=6 +ynh_script_progression --message="Installing Ruby dependencies..." --weight=3 pushd "$final_path/live" ynh_use_ruby @@ -221,7 +221,7 @@ ynh_add_systemd_config --service="$app-streaming" --template="glitchsoc-streamin #================================================= # INSTALLING GLITCH-SOC #================================================= -ynh_script_progression --message="Installing Glitch-Soc..." --weight=30 +ynh_script_progression --message="Installing Glitch-Soc..." --weight=5 pushd "$final_path/live" ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true' @@ -273,7 +273,7 @@ yunohost service add "$app-streaming" --description="$app streaming service" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=3 +ynh_script_progression --message="Starting a systemd service..." --weight=2 ynh_systemd_action --service_name=${app}-web --action="start" --log_path=systemd --line_match="Listening on" ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=systemd --line_match="Schedules Loaded" diff --git a/scripts/remove b/scripts/remove index 0d7da1f..6c80b89 100644 --- a/scripts/remove +++ b/scripts/remove @@ -83,7 +83,7 @@ ynh_remove_nginx_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --weight=30 +ynh_script_progression --message="Removing dependencies..." --weight=10 # Remove metapackage and its dependencies ynh_remove_ruby diff --git a/scripts/restore b/scripts/restore index 386825a..e8a3c9e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -75,7 +75,7 @@ chown -R $app:www-data "$final_path" #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=60 +ynh_script_progression --message="Reinstalling dependencies..." --weight=10 # Define and install dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies @@ -112,7 +112,7 @@ ynh_add_swap --size=$swap_needed #================================================= # INSTALLING RUBY AND BUNDLER #================================================= -ynh_script_progression --message="Installing Ruby dependencies..." --weight=30 +ynh_script_progression --message="Installing Ruby dependencies..." --weight=10 pushd "$final_path/live" ynh_use_ruby diff --git a/scripts/upgrade b/scripts/upgrade index d5d07e4..f7d73a9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -271,7 +271,7 @@ ynh_add_nginx_config #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=60 +ynh_script_progression --message="Upgrading dependencies..." --weight=10 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION @@ -299,7 +299,7 @@ ynh_add_swap --size=$swap_needed #================================================= # INSTALLING RUBY AND BUNDLER #================================================= -ynh_script_progression --message="Installing Ruby dependencies..." --weight=6 +ynh_script_progression --message="Installing Ruby dependencies..." --weight=5 pushd "$final_path/live" ynh_use_ruby @@ -334,7 +334,7 @@ ynh_add_systemd_config --service="$app-streaming" --template="glitchsoc-streamin #================================================= if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading Glitch-Soc..." --weight=30 + ynh_script_progression --message="Upgrading Glitch-Soc..." --weight=10 pushd "$final_path/live" ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true' From 813cd7fdcef4ea9c09d325995370646b58e13518 Mon Sep 17 00:00:00 2001 From: Tagadda <36127788+Tagadda@users.noreply.github.com> Date: Mon, 18 Apr 2022 11:50:22 +0000 Subject: [PATCH 6/6] Add upgrade test --- check_process | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/check_process b/check_process index 5d606e8..548a024 100644 --- a/check_process +++ b/check_process @@ -14,6 +14,8 @@ upgrade=1 # 2022.01.10~ynh2 upgrade=1 from_commit=325f6befc0d6da2b5102ad9c4ac64a5235ee470e + # 2022.03.31~ynh1 + upgrade=1 from_commit=a8f28047602b498cde25bfa05137d84518f13bbe backup_restore=1 multi_instance=0 port_already_use=0 @@ -22,3 +24,5 @@ ;;; Upgrade options ; commit=325f6befc0d6da2b5102ad9c4ac64a5235ee470e name=2022.01.10~ynh2 + ; commit=a8f28047602b498cde25bfa05137d84518f13bbe + name=2022.03.31~ynh1