diff --git a/manifest.toml b/manifest.toml index 9805926..f85d5c0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -87,3 +87,9 @@ ram.runtime = "500M" [resources.database] type = "postgresql" + + [resources.nodejs] + version = "22" + + [resources.ruby] + version = "3.4.5" diff --git a/scripts/_common.sh b/scripts/_common.sh index 9044c9c..c7ff983 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,5 +5,21 @@ #================================================= memory_needed="2560" -ruby_version="3.4.5" -nodejs_version="22" + +case $YNH_ARCH in + amd64) + ld_preload="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so" + ;; + arm64) + ld_preload="LD_PRELOAD=/usr/lib/aarch64-linux-gnu/libjemalloc.so" + ;; + armhf) + ld_preload="LD_PRELOAD=/usr/lib/arm-linux-gnueabihf/libjemalloc.so" + ;; + armel) + ld_preload="LD_PRELOAD=/usr/lib/arm-linux-gnueabi/libjemalloc.so" + ;; + i386) + ld_preload="LD_PRELOAD=/usr/lib/i386-linux-gnu/libjemalloc.so" + ;; +esac diff --git a/scripts/install b/scripts/install index ddb0692..4b6b798 100644 --- a/scripts/install +++ b/scripts/install @@ -8,14 +8,6 @@ admin_mail=$(ynh_user_get_info --username=$admin --key=mail) # Set `service` settings to support `yunohost app shell` command 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 #================================================= 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 cbb2d2c..9a706fb 100644 --- a/scripts/restore +++ b/scripts/restore @@ -37,14 +37,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 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 9b3c8db..97e9062 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,14 +46,6 @@ fi 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 #=================================================