diff options
| -rw-r--r-- | manifest.toml | 9 | ||||
| -rw-r--r-- | scripts/_common.sh | 2 | ||||
| -rw-r--r-- | scripts/install | 8 | ||||
| -rw-r--r-- | scripts/remove | 4 | ||||
| -rw-r--r-- | scripts/restore | 8 | ||||
| -rw-r--r-- | scripts/upgrade | 8 |
6 files changed, 8 insertions, 31 deletions
diff --git a/manifest.toml b/manifest.toml index 3575af5..066569a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ cpe = "cpe:2.3:a:joinmastodon:mastodon" fund = "https://joinmastodon.org/sponsors" [integration] -yunohost = ">= 12.0.10" +yunohost = ">= 12.1.15" helpers_version = "2.1" architectures = "all" multi_instance = true @@ -86,3 +86,10 @@ ram.runtime = "500M" [resources.database] type = "postgresql" + + [resources.nodejs] + version = "20" + + [resources.ruby] + version = "3.4.5" + diff --git a/scripts/_common.sh b/scripts/_common.sh index 089f541..c7ff983 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,8 +5,6 @@ #================================================= memory_needed="2560" -ruby_version="3.4.5" -nodejs_version="22" case $YNH_ARCH in amd64) diff --git a/scripts/install b/scripts/install index 7e400d5..38395c5 100644 --- a/scripts/install +++ b/scripts/install @@ -9,14 +9,6 @@ admin_mail=$(ynh_user_get_info --username=$admin --key=mail) ynh_app_setting_set --key=service --value="$app-web.service" #================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression "Installing Ruby and NodeJS..." - -ynh_ruby_install -ynh_nodejs_install - -#================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression "Setting up source files..." diff --git a/scripts/remove b/scripts/remove index d2c0cb5..5901cc8 100644 --- a/scripts/remove +++ b/scripts/remove @@ -36,10 +36,6 @@ ynh_safe_rm "/etc/cron.d/$app" # Remote logrotate config ynh_config_remove_logrotate -# Remove metapackage and its dependencies -ynh_ruby_remove -ynh_nodejs_remove - # Remove swap ynh_del_swap diff --git a/scripts/restore b/scripts/restore index 03f0dce..cdaf6a5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -38,14 +38,6 @@ ynh_script_progression "Adding $swap_needed Mo to swap..." ynh_add_swap --size=$swap_needed #================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression "Reinstalling Ruby and NodeJS..." - -ynh_ruby_install -ynh_nodejs_install - -#================================================= # BUILD APP #================================================= ynh_script_progression "Building app..." diff --git a/scripts/upgrade b/scripts/upgrade index 3b8f6e8..5ab2a51 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,14 +47,6 @@ ynh_script_progression "Adding $swap_needed Mo to swap..." ynh_add_swap --size=$swap_needed #================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression "Upgrading Ruby and NodeJS..." - -ynh_ruby_install -ynh_nodejs_install - -#================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression "Upgrading source files..." |