From f6227e99ccde84914cf596fb6cf08023c7e8b862 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Thu, 31 Jan 2019 21:57:25 -0500 Subject: Add cachedir to deployment scripts; fix bad logdir --- deployment/debian-package-x64/pkg-src/postinst | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'deployment/debian-package-x64/pkg-src/postinst') diff --git a/deployment/debian-package-x64/pkg-src/postinst b/deployment/debian-package-x64/pkg-src/postinst index 3690d20ba3..44d944ccb5 100644 --- a/deployment/debian-package-x64/pkg-src/postinst +++ b/deployment/debian-package-x64/pkg-src/postinst @@ -13,6 +13,7 @@ fi PROGRAMDATA=${JELLYFIN_DATA_DIRECTORY-/var/lib/$NAME} CONFIGDATA=${JELLYFIN_CONFIG_DIRECTORY-/etc/$NAME} LOGDATA=${JELLYFIN_LOG_DIRECTORY-/var/log/$NAME} +CACHEDATA=${JELLYFIN_CACHE_DIRECTORY-/var/cache/$NAME} case "$1" in configure) @@ -37,10 +38,15 @@ case "$1" in if [[ ! -d $LOGDATA ]]; then mkdir $LOGDATA fi + # ensure $CACHEDATA exists + if [[ ! -d $CACHEDATA ]]; then + mkdir $CACHEDATA + fi # Ensure permissions are correct on all config directories chown -R jellyfin:jellyfin $PROGRAMDATA chown -R jellyfin:jellyfin $CONFIGDATA chown -R jellyfin:jellyfin $LOGDATA + chown -R jellyfin:jellyfin $CACHEDATA chmod +x /usr/lib/jellyfin/restart.sh > /dev/null 2>&1 || true -- cgit v1.2.3 From 7774977cdd3a8032e699be94badd1ed07265ba75 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Fri, 1 Feb 2019 19:12:12 -0500 Subject: Implement review feedback --- deployment/debian-package-x64/pkg-src/conf/jellyfin | 2 +- deployment/debian-package-x64/pkg-src/postinst | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'deployment/debian-package-x64/pkg-src/postinst') diff --git a/deployment/debian-package-x64/pkg-src/conf/jellyfin b/deployment/debian-package-x64/pkg-src/conf/jellyfin index ebc11ca5c6..c237e2d692 100644 --- a/deployment/debian-package-x64/pkg-src/conf/jellyfin +++ b/deployment/debian-package-x64/pkg-src/conf/jellyfin @@ -22,7 +22,7 @@ JELLYFIN_CACHE_DIRECTORY="/var/cache/jellyfin" JELLYFIN_RESTART_OPT="--restartpath /usr/lib/jellyfin/restart.sh" # [OPTIONAL] ffmpeg binary paths -#JELLYFIN_FFMPEG_OPTS="-ffmpeg /usr/bin/ffmpeg -ffprobe /usr/bin/ffprobe" +#JELLYFIN_FFMPEG_OPTS="--ffmpeg /usr/bin/ffmpeg --ffprobe /usr/bin/ffprobe" # [OPTIONAL] Additional user-defined options for the binary #JELLYFIN_ADD_OPTS="" diff --git a/deployment/debian-package-x64/pkg-src/postinst b/deployment/debian-package-x64/pkg-src/postinst index 44d944ccb5..a784028eb1 100644 --- a/deployment/debian-package-x64/pkg-src/postinst +++ b/deployment/debian-package-x64/pkg-src/postinst @@ -43,10 +43,8 @@ case "$1" in mkdir $CACHEDATA fi # Ensure permissions are correct on all config directories - chown -R jellyfin:jellyfin $PROGRAMDATA - chown -R jellyfin:jellyfin $CONFIGDATA - chown -R jellyfin:jellyfin $LOGDATA - chown -R jellyfin:jellyfin $CACHEDATA + chown -R jellyfin:jellyfin $PROGRAMDATA $CONFIGDATA $LOGDATA $CACHEDATA + chmod 0750 $PROGRAMDATA $CONFIGDATA $LOGDATA $CACHEDATA chmod +x /usr/lib/jellyfin/restart.sh > /dev/null 2>&1 || true -- cgit v1.2.3 From b630e9de82587d3e336813cdc8a82ef316813f3e Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Fri, 1 Feb 2019 19:13:50 -0500 Subject: Allow adm group to view Jellyfin resources This is pretty arbitrary and personal, but I detest services that lock out global access (which is good), but don't simultaneously make it easy for administrators to enter the directories. The adm group should only have actual system administrators as members, so this lets them view the secure directories. --- deployment/debian-package-x64/pkg-src/postinst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'deployment/debian-package-x64/pkg-src/postinst') diff --git a/deployment/debian-package-x64/pkg-src/postinst b/deployment/debian-package-x64/pkg-src/postinst index a784028eb1..860222e051 100644 --- a/deployment/debian-package-x64/pkg-src/postinst +++ b/deployment/debian-package-x64/pkg-src/postinst @@ -43,7 +43,8 @@ case "$1" in mkdir $CACHEDATA fi # Ensure permissions are correct on all config directories - chown -R jellyfin:jellyfin $PROGRAMDATA $CONFIGDATA $LOGDATA $CACHEDATA + chown -R jellyfin $PROGRAMDATA $CONFIGDATA $LOGDATA $CACHEDATA + chgrp adm $PROGRAMDATA $CONFIGDATA $LOGDATA $CACHEDATA chmod 0750 $PROGRAMDATA $CONFIGDATA $LOGDATA $CACHEDATA chmod +x /usr/lib/jellyfin/restart.sh > /dev/null 2>&1 || true -- cgit v1.2.3