Merge remote-tracking branch 'upstream/master'
This commit is contained in:
BuildTools
commit
54de1404ca
5 changed files with 84 additions and 57 deletions
|
|
@ -6,16 +6,9 @@ mkdir -p /run/plex-temp
|
|||
# create folders
|
||||
if [[ ! -d "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" ]]; then
|
||||
mkdir -p "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}"
|
||||
lsiown -R abc:abc /config
|
||||
fi
|
||||
|
||||
# check Library permissions
|
||||
PUID=${PUID:-911}
|
||||
if [[ ! "$(stat -c %u /config/Library)" == "${PUID}" ]]; then
|
||||
echo "Change in ownership detected, please be patient while we chown existing files"
|
||||
echo "This could take some time"
|
||||
lsiown -R abc:abc \
|
||||
/config/Library
|
||||
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
|
||||
lsiown -R abc:abc /config
|
||||
fi
|
||||
fi
|
||||
|
||||
# remove plex pid after unclean stop
|
||||
|
|
@ -23,20 +16,31 @@ if [[ -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.
|
|||
rm -f "/config/Library/Application Support/Plex Media Server/plexmediaserver.pid"
|
||||
fi
|
||||
|
||||
# set permissions on Plex Transcoder Temp Directory
|
||||
PLEX_MEDIA_SERVER_PREFERENCES="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}/Plex Media Server/Preferences.xml"
|
||||
if [[ -f "${PLEX_MEDIA_SERVER_PREFERENCES}" ]]; then
|
||||
TranscoderTempDirectory='\bTranscoderTempDirectory="([^"]+)"'
|
||||
while IFS= read -r line; do
|
||||
if [[ ${line} =~ ${TranscoderTempDirectory} ]] && [[ -d "${BASH_REMATCH[1]}" ]]; then
|
||||
echo "Setting permissions on ${BASH_REMATCH[1]}"
|
||||
lsiown -R abc:abc "${BASH_REMATCH[1]}"
|
||||
fi
|
||||
done <"${PLEX_MEDIA_SERVER_PREFERENCES}"
|
||||
fi
|
||||
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
|
||||
# check Library permissions
|
||||
PUID=${PUID:-911}
|
||||
if [[ ! "$(stat -c %u /config/Library)" == "${PUID}" ]]; then
|
||||
echo "Change in ownership detected, please be patient while we chown existing files"
|
||||
echo "This could take some time"
|
||||
lsiown -R abc:abc \
|
||||
/config/Library
|
||||
fi
|
||||
|
||||
# permissions (non-recursive) on config root and folders
|
||||
lsiown abc:abc \
|
||||
/run/plex-temp \
|
||||
/config \
|
||||
/config/*
|
||||
# set permissions on Plex Transcoder Temp Directory
|
||||
PLEX_MEDIA_SERVER_PREFERENCES="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}/Plex Media Server/Preferences.xml"
|
||||
if [[ -f "${PLEX_MEDIA_SERVER_PREFERENCES}" ]]; then
|
||||
TranscoderTempDirectory='\bTranscoderTempDirectory="([^"]+)"'
|
||||
while IFS= read -r line; do
|
||||
if [[ ${line} =~ ${TranscoderTempDirectory} ]] && [[ -d "${BASH_REMATCH[1]}" ]]; then
|
||||
echo "Setting permissions on ${BASH_REMATCH[1]}"
|
||||
lsiown -R abc:abc "${BASH_REMATCH[1]}"
|
||||
fi
|
||||
done <"${PLEX_MEDIA_SERVER_PREFERENCES}"
|
||||
fi
|
||||
|
||||
# permissions (non-recursive) on config root and folders
|
||||
lsiown abc:abc \
|
||||
/run/plex-temp \
|
||||
/config \
|
||||
/config/*
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,35 +1,37 @@
|
|||
#!/usr/bin/with-contenv bash
|
||||
# shellcheck shell=bash
|
||||
|
||||
FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null)
|
||||
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
|
||||
FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null)
|
||||
|
||||
for i in ${FILES}; do
|
||||
VIDEO_GID=$(stat -c '%g' "${i}")
|
||||
VIDEO_UID=$(stat -c '%u' "${i}")
|
||||
# check if user matches device
|
||||
if id -u abc | grep -qw "${VIDEO_UID}"; then
|
||||
echo "**** permissions for ${i} are good ****"
|
||||
else
|
||||
# check if group matches and that device has group rw
|
||||
if id -G abc | grep -qw "${VIDEO_GID}" && [[ $(stat -c '%A' "${i}" | cut -b 5,6) == "rw" ]]; then
|
||||
for i in ${FILES}; do
|
||||
VIDEO_GID=$(stat -c '%g' "${i}")
|
||||
VIDEO_UID=$(stat -c '%u' "${i}")
|
||||
# check if user matches device
|
||||
if id -u abc | grep -qw "${VIDEO_UID}"; then
|
||||
echo "**** permissions for ${i} are good ****"
|
||||
# check if device needs to be added to video group
|
||||
elif ! id -G abc | grep -qw "${VIDEO_GID}"; then
|
||||
# check if video group needs to be created
|
||||
VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}')
|
||||
if [[ -z "${VIDEO_NAME}" ]]; then
|
||||
VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)"
|
||||
groupadd "${VIDEO_NAME}"
|
||||
groupmod -g "${VIDEO_GID}" "${VIDEO_NAME}"
|
||||
echo "**** creating video group ${VIDEO_NAME} with id ${VIDEO_GID} ****"
|
||||
else
|
||||
# check if group matches and that device has group rw
|
||||
if id -G abc | grep -qw "${VIDEO_GID}" && [[ $(stat -c '%A' "${i}" | cut -b 5,6) == "rw" ]]; then
|
||||
echo "**** permissions for ${i} are good ****"
|
||||
# check if device needs to be added to video group
|
||||
elif ! id -G abc | grep -qw "${VIDEO_GID}"; then
|
||||
# check if video group needs to be created
|
||||
VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}')
|
||||
if [[ -z "${VIDEO_NAME}" ]]; then
|
||||
VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)"
|
||||
groupadd "${VIDEO_NAME}"
|
||||
groupmod -g "${VIDEO_GID}" "${VIDEO_NAME}"
|
||||
echo "**** creating video group ${VIDEO_NAME} with id ${VIDEO_GID} ****"
|
||||
fi
|
||||
echo "**** adding ${i} to video group ${VIDEO_NAME} with id ${VIDEO_GID} ****"
|
||||
usermod -a -G "${VIDEO_NAME}" abc
|
||||
fi
|
||||
# check if device has group rw
|
||||
if [[ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]]; then
|
||||
echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****"
|
||||
chmod g+rw "${i}"
|
||||
fi
|
||||
echo "**** adding ${i} to video group ${VIDEO_NAME} with id ${VIDEO_GID} ****"
|
||||
usermod -a -G "${VIDEO_NAME}" abc
|
||||
fi
|
||||
# check if device has group rw
|
||||
if [[ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]]; then
|
||||
echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****"
|
||||
chmod g+rw "${i}"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
done
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -8,6 +8,13 @@ PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m)
|
|||
export PLEX_MEDIA_SERVER_INFO_MODEL
|
||||
PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r)
|
||||
export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION
|
||||
exec \
|
||||
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 32400" \
|
||||
s6-setuidgid abc "/usr/lib/plexmediaserver/Plex Media Server"
|
||||
|
||||
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
|
||||
exec \
|
||||
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 32400" \
|
||||
s6-setuidgid abc "/usr/lib/plexmediaserver/Plex Media Server"
|
||||
else
|
||||
exec \
|
||||
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 32400" \
|
||||
"/usr/lib/plexmediaserver/Plex Media Server"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue