pedro
/
cdist-contrib-pedro-fork
forked from ungleich-public/cdist-contrib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small bugfixes

This commit is contained in:
pedro 2022-05-10 14:36:24 +02:00
parent e6d087d2da
commit af663e074e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
type/__jitsi_jibri/manifest
View File

@ -12,7 +12,7 @@ kernel_release="$(cat "${__object}/explorer/kernel_release")"
case "${os}" in case "${os}" in
devuan|debian) devuan|debian)
if echo "${kernel_release}" | grep -qE "cloud|rt"; then if echo "${kernel_release}" | grep -qE "cloud|rt"; then
printf "using wrong kernel ${kernel_release}, do/use: apt install linux-image-amd64" >&2 echo "using wrong kernel ${kernel_release}, do/use: apt install linux-image-amd64" >&2
exit 1 exit 1
fi fi
;; ;;
@ -23,7 +23,7 @@ case "${os}" in
# and to check for different kernel # and to check for different kernel
# src https://github.com/jitsi/jibri#installation-notes # src https://github.com/jitsi/jibri#installation-notes
*) *)
echo "Your OS '${os}' is currently not supported." > /dev/stderr echo "Your OS '${os}' is currently not supported." >&2
exit 1 exit 1
;; ;;
esac esac
@ -103,7 +103,7 @@ require="__directory/${CHROME_POLICIES}" __file "${CHROME_POLICIES}/managed_poli
EOF EOF
# Proceed only after installation/upgrade has finished # Proceed only after installation/upgrade has finished
export require="__package/jibri" export require='__package/jibri'
__user_groups 'jibri' --group 'adm' --group 'audio' --group 'video' --group 'plugdev' __user_groups 'jibri' --group 'adm' --group 'audio' --group 'video' --group 'plugdev'
# TODO tell to evilham that this way, missing a variable makes the whole file to be unprocessed, is it desirable? # TODO tell to evilham that this way, missing a variable makes the whole file to be unprocessed, is it desirable?
@ -127,8 +127,8 @@ __file '/opt/jitsi/jibri/launch.sh' \
--onchange 'systemctl daemon-reload && systemctl restart jibri.service' \ --onchange 'systemctl daemon-reload && systemctl restart jibri.service' \
--mode 755 \ --mode 755 \
--source '-' <<EOF --source '-' <<EOF
# Managed remotely, changes will be lost
#!/bin/bash #!/bin/bash
# Managed remotely, changes will be lost
exec /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -Djava.util.logging.config.file=/etc/jitsi/jibri/logging.properties -Dconfig.file="/etc/jitsi/jibri/jibri.conf" -jar /opt/jitsi/jibri/jibri.jar --config "/etc/jitsi/jibri/config.json" exec /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -Djava.util.logging.config.file=/etc/jitsi/jibri/logging.properties -Dconfig.file="/etc/jitsi/jibri/jibri.conf" -jar /opt/jitsi/jibri/jibri.jar --config "/etc/jitsi/jibri/config.json"
EOF EOF