unkin/puppet-prod
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'feat: add param for ffmpeg' (#114) from neoloc/ffpmeg_path into develop

Browse Source 
Reviewed-on: https://git.query.consul/unkinben/puppet-prod/pulls/114
This commit is contained in:
Ben Vincent 2024-07-12 18:17:16 +10:00
commit e2f571649e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
site/profiles/manifests/media/jellyfin.pp
View File

@ -6,6 +6,7 @@ class profiles::media::jellyfin (
Stdlib::Absolutepath $cache_dir = '/data/jellyfin/var/cache', Stdlib::Absolutepath $cache_dir = '/data/jellyfin/var/cache',
Stdlib::Absolutepath $config_dir = '/data/jellyfin/etc', Stdlib::Absolutepath $config_dir = '/data/jellyfin/etc',
Stdlib::Absolutepath $log_dir = '/data/jellyfin/var/log', 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 $sysconfig_file = '/etc/sysconfig/jellyfin',
Stdlib::Absolutepath $migration_flag = '/etc/sysconfig/jellyfin_migration_done', Stdlib::Absolutepath $migration_flag = '/etc/sysconfig/jellyfin_migration_done',
String $service_name = 'jellyfin', String $service_name = 'jellyfin',

2
site/profiles/templates/jellyfin/sysconfig.erb
View File

@ -24,7 +24,7 @@ JELLYFIN_CACHE_DIR="<%= @cache_dir %>"
JELLYFIN_WEB_OPT="--webdir=/usr/share/jellyfin-web" JELLYFIN_WEB_OPT="--webdir=/usr/share/jellyfin-web"
# [OPTIONAL] ffmpeg binary paths, overriding the UI-configured values # [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 # [OPTIONAL] run Jellyfin as a headless service
#JELLYFIN_SERVICE_OPT="--service" #JELLYFIN_SERVICE_OPT="--service"