From 0fb11b22cf334ec5a2c41ae8e65b3554f96a023b Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Thu, 11 Jul 2024 22:41:08 +1000 Subject: [PATCH] feat: add param for ffmpeg - add param to jellyfin class to specify the path to ffmpeg - update templates to use location --- site/profiles/manifests/media/jellyfin.pp | 1 + site/profiles/templates/jellyfin/sysconfig.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/site/profiles/manifests/media/jellyfin.pp b/site/profiles/manifests/media/jellyfin.pp index b29f1f7..4943a1c 100644 --- a/site/profiles/manifests/media/jellyfin.pp +++ b/site/profiles/manifests/media/jellyfin.pp @@ -6,6 +6,7 @@ class profiles::media::jellyfin ( Stdlib::Absolutepath $cache_dir = '/data/jellyfin/var/cache', Stdlib::Absolutepath $config_dir = '/data/jellyfin/etc', Stdlib::Absolutepath $log_dir = '/data/jellyfin/var/log', + Stdlib::Absolutepath $ffmpeg_path = '/usr/local/bin/ffmpeg', Stdlib::Absolutepath $sysconfig_file = '/etc/sysconfig/jellyfin', Stdlib::Absolutepath $migration_flag = '/etc/sysconfig/jellyfin_migration_done', String $service_name = 'jellyfin', diff --git a/site/profiles/templates/jellyfin/sysconfig.erb b/site/profiles/templates/jellyfin/sysconfig.erb index fe2818c..c37b26d 100644 --- a/site/profiles/templates/jellyfin/sysconfig.erb +++ b/site/profiles/templates/jellyfin/sysconfig.erb @@ -24,7 +24,7 @@ JELLYFIN_CACHE_DIR="<%= @cache_dir %>" JELLYFIN_WEB_OPT="--webdir=/usr/share/jellyfin-web" # [OPTIONAL] ffmpeg binary paths, overriding the UI-configured values -#JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/bin/ffmpeg" +JELLYFIN_FFMPEG_OPT="--ffmpeg=<% @ffmpeg_path %>" # [OPTIONAL] run Jellyfin as a headless service #JELLYFIN_SERVICE_OPT="--service"