diff --git a/manifest.toml b/manifest.toml index 2b5f95d..b1a4d44 100644 --- a/manifest.toml +++ b/manifest.toml @@ -108,6 +108,8 @@ ram.runtime = "500M" "libmojolicious-perl", "libfile-slurper-perl", "liblcms2-2", + "libllvm16", + "libllvm13", "redis-server" ] @@ -115,7 +117,20 @@ ram.runtime = "500M" repo = "deb https://apt.postgresql.org/pub/repos/apt __YNH_DEBIAN_VERSION__-pgdg main 16" key = "https://www.postgresql.org/media/keys/ACCC4CF8.asc" packages = [ - "libllvm13", "libpq5", "libpq-dev" , "postgresql-16", "postgresql-16-pgvector", "postgresql-client-16", "postgresql-common", "postgresql-client-common" + "libpq5", + "libpq-dev", + "postgresql-16", + "postgresql-16-pgvector", + "postgresql-client-16", + "postgresql-common", + "postgresql-client-common" + ] + + [resources.apt.extras.jellyfin-ffmpeg] + repo = "deb [arch=__YNH_ARCH__] https://repo.jellyfin.org/debian __YNH_DEBIAN_VERSION__ main" + key = "https://repo.jellyfin.org/jellyfin_team.gpg.key" + packages = [ + "jellyfin-ffmpeg6" ] [resources.database] diff --git a/scripts/_common.sh b/scripts/_common.sh index f73f2a6..6d47c46 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -122,7 +122,11 @@ myynh_install_immich() { # Thanks to https://github.com/arter97/immich-native # Check https://github.com/immich-app/base-images/blob/main/server/Dockerfile for changes - ynh_use_nodejs + # Add jellyfin-ffmpeg to $PATH + PATH="/usr/lib/jellyfin-ffmpeg:$PATH" + + # Use ynh nodejs helper + ynh_use_nodejs # Use 127.0.0.1 cd "$source_dir" diff --git a/scripts/restore b/scripts/restore index 1d316c0..206669f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,13 +27,6 @@ ynh_restore_file --origin_path="$data_dir" --not_mandatory chown -R $app:$app "$data_dir" -#================================================= -# INSTALL NODEJS -#================================================= -ynh_script_progression --message="Reinstalling nodejs..." --weight=5 - -ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" - #================================================= # CHECK PYTHON VERSION AND COMPILE IF NEEDED #================================================= @@ -42,6 +35,13 @@ ynh_script_progression --message="Check Python version & compile the required on py_required_version=$(ynh_app_setting_get --app="$app" --key=python) myynh_install_python --python="$py_required_version" +#================================================= +# INSTALL NODEJS +#================================================= +ynh_script_progression --message="Reinstalling nodejs..." --weight=5 + +ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" + #================================================= # RESTORE THE DATABASE #=================================================