diff options
| author | yalh76 <yalh@yahoo.com> | 2021-05-10 21:18:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-10 21:18:45 +0200 |
| commit | acbea32d2a33e78d24b67416883618a24c6c5945 (patch) | |
| tree | 7c6fa30cbee71c867eaa294fc6af9dbeac8c3028 | |
| parent | 5a60edb5569e7d2bd1f063d891c4cefc6818dbec (diff) | |
| parent | 096eb06ef227d079841d4a27f60a918c5e037b8c (diff) | |
| download | mastodon_ynh-acbea32d2a33e78d24b67416883618a24c6c5945.tar.gz mastodon_ynh-acbea32d2a33e78d24b67416883618a24c6c5945.tar.bz2 mastodon_ynh-acbea32d2a33e78d24b67416883618a24c6c5945.zip | |
Merge pull request #271 from YunoHost-Apps/4.2
4.2
| -rw-r--r-- | manifest.json | 2 | ||||
| -rw-r--r-- | scripts/install | 6 | ||||
| -rw-r--r-- | scripts/upgrade | 6 | ||||
| -rw-r--r-- | scripts/ynh_install_ruby__2 | 1 |
4 files changed, 8 insertions, 7 deletions
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": [ 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. # |