From f9a0796df2c8ca4d0ff84a04ca49a94bf89cad06 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 9 May 2021 19:32:14 +0200 Subject: [PATCH 1/2] Minimal requirement --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 620229a..f68ad59 100644 --- a/manifest.json +++ b/manifest.json @@ -23,7 +23,7 @@ } ], "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.0" }, "multi_instance": true, "services": [ From 096eb06ef227d079841d4a27f60a918c5e037b8c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 10 May 2021 15:52:05 +0200 Subject: [PATCH 2/2] Fix for 4.2 --- scripts/install | 6 +++--- scripts/upgrade | 6 +++--- scripts/ynh_install_ruby__2 | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index f5da202..7e8e99d 100644 --- a/scripts/install +++ b/scripts/install @@ -190,9 +190,9 @@ chown $app:$app "$final_path/live/config/settings.yml" ynh_script_progression --message="Configuring a systemd service..." # Create a dedicated systemd config -ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" --others_var="port_web RBENV_ROOT" -ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" --others_var="RBENV_ROOT" -ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" --others_var="port_stream ynh_node_load_PATH ynh_node" +ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" +ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" +ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" #================================================= # INSTALLING MASTODON diff --git a/scripts/upgrade b/scripts/upgrade index 62d576e..c5c46f0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -247,9 +247,9 @@ chown $app:$app "$config" ynh_script_progression --message="Upgrading systemd configuration..." # Create a dedicated systemd config -ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" --others_var="port_web RBENV_ROOT" -ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" --others_var="RBENV_ROOT" -ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" --others_var="port_stream ynh_node_load_PATH ynh_node" +ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" +ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" +ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" #================================================= # UPGRADE MASTODON diff --git a/scripts/ynh_install_ruby__2 b/scripts/ynh_install_ruby__2 index fae1755..b12ab74 100644 --- a/scripts/ynh_install_ruby__2 +++ b/scripts/ynh_install_ruby__2 @@ -12,6 +12,7 @@ rbenv_install_dir="/opt/rbenv" ruby_version_path="$rbenv_install_dir/versions" # RBENV_ROOT is the directory of rbenv, it needs to be loaded as a environment variable. export RBENV_ROOT="$rbenv_install_dir" +export rbenv_root="$rbenv_install_dir" # Load the version of Ruby for an app, and set variables. #