Skip to content

Commit 13bd1da

Browse files
committed
switch to hybrid
1 parent eb3fedc commit 13bd1da

File tree

13 files changed

+72
-4
lines changed

13 files changed

+72
-4
lines changed

root/etc/cont-init.d/98-rffmpeg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ if [ -f /config/rffmpeg/rffmpeg.db ]; then
5151
else
5252
echo "**** Initialize database ****"
5353
/usr/local/bin/rffmpeg init --yes
54-
#Add host
55-
if [ ! -z "$RFFMPEG_HOST" ]; then
56-
s6-setuidgid abc /usr/local/bin/rffmpeg add --weight 1 $RFFMPEG_HOST
57-
fi
54+
#Add host
55+
if [ ! -z "$RFFMPEG_HOST" ]; then
56+
s6-setuidgid abc /usr/local/bin/rffmpeg add --weight 1 $RFFMPEG_HOST
57+
fi
5858
fi

root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-rffmpeg-add-package/dependencies.d/init-mods

Whitespace-only changes.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
for package in iputils-ping openssh-client python3-click python3-yaml wakeonlan; do
4+
if ! dpkg -s "${package}" >/dev/null 2>&1; then
5+
PACKAGES="${package} ${PACKAGES}"
6+
fi
7+
done
8+
9+
if [ -n "${PACKAGES}" ]; then
10+
echo "${PACKAGES}" >> /mod-repo-packages-to-install.list
11+
echo "**** Adding rffmpeg dependencies to package install list ****"
12+
else
13+
echo "**** rffmpeg dependencies already installed, skipping ****"
14+
fi
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oneshot
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-rffmpeg-add-package/run

root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-rffmpeg-setup/dependencies.d/init-mods-package-install

Whitespace-only changes.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
#Grab Config
4+
mkdir -p \
5+
/etc/rffmpeg \
6+
/config/rffmpeg/.ssh
7+
touch /config/rffmpeg/.ssh/id_rsa
8+
chmod 600 /config/rffmpeg/.ssh/id_rsa
9+
if [ -f /config/rffmpeg/rffmpeg.yml ]; then
10+
echo "**** rffmpeg.yml already present ****"
11+
else
12+
echo "**** Creating rffmpeg.yml from sample ****"
13+
cp /defaults/rffmpeg.yml.sample /config/rffmpeg/rffmpeg.yml
14+
fi
15+
16+
#Grab rffmpeg
17+
mkdir -p /usr/local/bin/
18+
echo "**** Grabbing rffmpeg from upstream ****"
19+
rm -rf /usr/local/bin/rffmpeg
20+
curl -L -o /usr/local/bin/rffmpeg https://raw.githubusercontent.com/joshuaboniface/rffmpeg/master/rffmpeg
21+
chmod +x /usr/local/bin/rffmpeg
22+
23+
##Update rffmpeg.yml
24+
sed -i 's~#persist: "/run/shm"~persist: "/dev/shm"~' /config/rffmpeg/rffmpeg.yml
25+
sed -i 's~#state: "/var/lib/rffmpeg"~state: "/config/rffmpeg"~' /config/rffmpeg/rffmpeg.yml
26+
sed -i 's~#logfile: "/var/log/jellyfin/rffmpeg.log"~logfile: "/config/rffmpeg/rffmpeg.log"~' /config/rffmpeg/rffmpeg.yml
27+
sed -i 's~#log_to_file: true~log_to_file: true~' /config/rffmpeg/rffmpeg.yml
28+
sed -i 's~#owner: jellyfin~owner: abc~' /config/rffmpeg/rffmpeg.yml
29+
sed -i 's~#group: sudo~group: abc~' /config/rffmpeg/rffmpeg.yml
30+
sed -i 's~#args:~args:~' /config/rffmpeg/rffmpeg.yml
31+
sed -i 's~# - "-i"~ - "-i"~' /config/rffmpeg/rffmpeg.yml
32+
sed -i 's~# - "/var/lib/jellyfin/id_rsa"~ - "/config/rffmpeg/.ssh/id_rsa"~' /config/rffmpeg/rffmpeg.yml
33+
if [ ! -z "$RFFMPEG_USER" ]; then
34+
sed -i "s~#user: jellyfin~user: $RFFMPEG_USER~" /config/rffmpeg/rffmpeg.yml
35+
fi
36+
37+
#Fix permissions
38+
chown abc:abc -R /config/rffmpeg
39+
40+
#Initialize database
41+
if [ -f /config/rffmpeg/rffmpeg.db ]; then
42+
echo "**** rffmpeg DB already inialized ****"
43+
else
44+
echo "**** Initialize rffmpeg database ****"
45+
/usr/local/bin/rffmpeg init --yes
46+
#Add host
47+
if [ ! -z "$RFFMPEG_HOST" ]; then
48+
s6-setuidgid abc /usr/local/bin/rffmpeg add --weight 1 $RFFMPEG_HOST
49+
fi
50+
fi
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oneshot
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-rffmpeg-setup/run

root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-jellyfin-rffmpeg-setup

Whitespace-only changes.

0 commit comments

Comments
 (0)