mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-23 22:21:04 +02:00
Merge pull request #804 from joshuaboniface/fix-env
Handle new option parser properly
This commit is contained in:
commit
1e6c41e333
|
@ -19,13 +19,17 @@ JELLYFIN_LOG_DIRECTORY="/var/log/jellyfin"
|
||||||
JELLYFIN_CACHE_DIRECTORY="/var/cache/jellyfin"
|
JELLYFIN_CACHE_DIRECTORY="/var/cache/jellyfin"
|
||||||
|
|
||||||
# Restart script for in-app server control
|
# Restart script for in-app server control
|
||||||
JELLYFIN_RESTART_OPT="--restartpath /usr/lib/jellyfin/restart.sh"
|
JELLYFIN_RESTART_OPT="--restartpath=/usr/lib/jellyfin/restart.sh"
|
||||||
|
|
||||||
# [OPTIONAL] ffmpeg binary paths
|
# [OPTIONAL] ffmpeg binary paths, overriding the UI-configured values
|
||||||
#JELLYFIN_FFMPEG_OPTS="--ffmpeg /usr/bin/ffmpeg --ffprobe /usr/bin/ffprobe"
|
#JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/bin/ffmpeg"
|
||||||
|
#JELLYFIN_FFPROBE_OPT="--ffprobe=/usr/bin/ffprobe"
|
||||||
|
|
||||||
# [OPTIONAL] Additional user-defined options for the binary
|
# [OPTIONAL] run Jellyfin as a headless service
|
||||||
#JELLYFIN_ADD_OPTS=""
|
#JELLYFIN_SERVICE_OPT="--service"
|
||||||
|
|
||||||
|
# [OPTIONAL] run Jellyfin without the web app
|
||||||
|
#JELLYFIN_NOWEBAPP_OPT="--noautorunwebapp"
|
||||||
|
|
||||||
#
|
#
|
||||||
# SysV init/Upstart options
|
# SysV init/Upstart options
|
||||||
|
@ -34,4 +38,4 @@ JELLYFIN_RESTART_OPT="--restartpath /usr/lib/jellyfin/restart.sh"
|
||||||
# Application username
|
# Application username
|
||||||
JELLYFIN_USER="jellyfin"
|
JELLYFIN_USER="jellyfin"
|
||||||
# Full application command
|
# Full application command
|
||||||
JELLYFIN_ARGS="--datadir $JELLYFIN_DATA_DIRECTORY --configdir $JELLYFIN_CONFIG_DIRECTORY --logdir $JELLYFIN_LOG_DIRECTORY --cachedir $JELLYFIN_CACHE_DIRECTORY $JELLYFIN_RESTART_OPT $JELLYFIN_FFMPEG_OPTS $JELLYFIN_ADD_OPTS"
|
JELLYFIN_ARGS="--datadir=$JELLYFIN_DATA_DIRECTORY --configdir=$JELLYFIN_CONFIG_DIRECTORY --logdir=$JELLYFIN_LOG_DIRECTORY --cachedir=$JELLYFIN_CACHE_DIRECTORY $JELLYFIN_RESTART_OPT $JELLYFIN_FFMPEG_OPT $JELLYFIN_FFPROBE_OPT $JELLYFIN_SERVICE_OPT $JELLFIN_NOWEBAPP_OPT"
|
||||||
|
|
|
@ -6,7 +6,7 @@ After = network.target
|
||||||
Type = simple
|
Type = simple
|
||||||
EnvironmentFile = /etc/default/jellyfin
|
EnvironmentFile = /etc/default/jellyfin
|
||||||
User = jellyfin
|
User = jellyfin
|
||||||
ExecStart = /usr/bin/jellyfin --datadir ${JELLYFIN_DATA_DIRECTORY} --configdir ${JELLYFIN_CONFIG_DIRECTORY} --logdir ${JELLYFIN_LOG_DIRECTORY} --cachedir ${JELLYFIN_CACHE_DIRECTORY} ${JELLYFIN_RESTART_OPT} ${JELLYFIN_FFMPEG_OPTS} ${JELLYFIN_ADD_OPTS}
|
ExecStart = /usr/bin/jellyfin --datadir=${JELLYFIN_DATA_DIRECTORY} --configdir=${JELLYFIN_CONFIG_DIRECTORY} --logdir=${JELLYFIN_LOG_DIRECTORY} --cachedir=${JELLYFIN_CACHE_DIRECTORY} ${JELLYFIN_RESTART_OPT} ${JELLYFIN_FFMPEG_OPT} ${JELLYFIN_FFPROBE_OPT} ${JELLYFIN_SERVICE_OPT} ${JELLYFIN_NOWEBAPP_OPT}
|
||||||
Restart = on-failure
|
Restart = on-failure
|
||||||
TimeoutSec = 15
|
TimeoutSec = 15
|
||||||
|
|
||||||
|
|
|
@ -14,15 +14,22 @@
|
||||||
# General options
|
# General options
|
||||||
#
|
#
|
||||||
|
|
||||||
# Tell jellyfin wich ffmpeg/ffprobe to use
|
|
||||||
# JELLYFIN_FFMPEG="--ffmpeg /usr/bin/ffmpeg --ffprobe /usr/bin/ffprobe"
|
|
||||||
|
|
||||||
# Program directories
|
# Program directories
|
||||||
JELLYFIN_DATA_DIRECTORY="/var/lib/jellyfin"
|
JELLYFIN_DATA_DIRECTORY="/var/lib/jellyfin"
|
||||||
JELLYFIN_CONFIG_DIRECTORY="/etc/jellyfin"
|
JELLYFIN_CONFIG_DIRECTORY="/etc/jellyfin"
|
||||||
JELLYFIN_LOG_DIRECTORY="/var/log/jellyfin"
|
JELLYFIN_LOG_DIRECTORY="/var/log/jellyfin"
|
||||||
JELLYFIN_CACHE_DIRECTORY="/var/cache/jellyfin"
|
JELLYFIN_CACHE_DIRECTORY="/var/cache/jellyfin"
|
||||||
|
|
||||||
# In-App service control
|
# In-App service control
|
||||||
JELLYFIN_RESTART_OPT="--restartpath /usr/libexec/jellyfin/restart.sh"
|
JELLYFIN_RESTART_OPT="--restartpath=/usr/libexec/jellyfin/restart.sh"
|
||||||
# Additional options for the binary
|
|
||||||
JELLYFIN_ADD_OPTS=""
|
# [OPTIONAL] ffmpeg binary paths, overriding the UI-configured values
|
||||||
|
#JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/bin/ffmpeg"
|
||||||
|
#JELLYFIN_FFPROBE_OPT="--ffprobe=/usr/bin/ffprobe"
|
||||||
|
|
||||||
|
# [OPTIONAL] run Jellyfin as a headless service
|
||||||
|
#JELLYFIN_SERVICE_OPT="--service"
|
||||||
|
|
||||||
|
# [OPTIONAL] run Jellyfin without the web app
|
||||||
|
#JELLYFIN_NOWEBAPP_OPT="--noautorunwebapp"
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ Description=Jellyfin is a free software media system that puts you in control of
|
||||||
[Service]
|
[Service]
|
||||||
EnvironmentFile=/etc/sysconfig/jellyfin
|
EnvironmentFile=/etc/sysconfig/jellyfin
|
||||||
WorkingDirectory=/var/lib/jellyfin
|
WorkingDirectory=/var/lib/jellyfin
|
||||||
ExecStart=/usr/bin/jellyfin --datadir ${JELLYFIN_DATA_DIRECTORY} --configdir ${JELLYFIN_CONFIG_DIRECTORY} --logdir ${JELLYFIN_LOG_DIRECTORY} --cachedir ${JELLYFIN_CACHE_DIRECTORY} ${JELLYFIN_RESTART_OPT} ${JELLYFIN_ADD_OPTS} ${JELLYFIN_FFMPEG}
|
ExecStart=/usr/bin/jellyfin --datadir=${JELLYFIN_DATA_DIRECTORY} --configdir=${JELLYFIN_CONFIG_DIRECTORY} --logdir=${JELLYFIN_LOG_DIRECTORY} --cachedir=${JELLYFIN_CACHE_DIRECTORY} ${JELLYFIN_RESTART_OPT} ${JELLYFIN_FFMPEG_OPT} ${JELLYFIN_FFPROBE_OPT} ${JELLYFIN_SERVICE_OPT} ${JELLYFIN_NOWEBAPP_OPT}
|
||||||
TimeoutSec=15
|
TimeoutSec=15
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
User=jellyfin
|
User=jellyfin
|
||||||
|
|
Loading…
Reference in a new issue