progress during cdist meeting 2022-5-18

type/__jitsi_jibri/files/jibri.conf.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -eu
 
 # Start
-cat <<EOF
+JIBRI_CONFIG="$(cat <<EOF
 # Managed remotely, changes will be lost
 
 # thanks
@@ -133,3 +133,4 @@ jibri {
   }
 }
 EOF
+)"

type/__jitsi_jibri/files/xorg-video-dummy.conf.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -eu
 
-cat <<EOF
+JIBRI_XORG_CONFIG="$(cat <<EOF
 # Managed remotely, changes will be lost
 
 # This xorg configuration file is meant to be used by xpra
@@ -125,3 +125,4 @@ Section "ServerLayout"
   Screen       "dummy_screen"
 EndSection
 EOF
+)"

type/__jitsi_jibri/manifest

@@ -3,9 +3,6 @@
 JIBRI_HOST="${__target_host}"
 JIBRI_AUTH_PASS='jibriauthpass'
 JIBRI_RECORDER_PASS='jibrirecorderpass'
-export JIBRI_HOST
-export JIBRI_AUTH_PASS
-export JIBRI_RECORDER_PASS
 
 os="$(cat "${__global}/explorer/os")"
 kernel_release="$(cat "${__object}/explorer/kernel_release")"
@@ -65,7 +62,7 @@ require='__apt_key/google-chrome' __apt_source google-chrome \
 
 ## Ensure apt cache is up-to-date
 require='__apt_source/jitsi_meet __apt_source/google-chrome __apt_source/debian9' __check_messages update_jibri \
-	--pattern '^__apt_source/(jitsi_meet|google-chrome)' \
+	--pattern '^__apt_source/(jitsi_meet|google-chrome|debian9)' \
 	--execute 'apt update'
 
 PKGS="$( grep -v '#' <<END
@@ -106,22 +103,22 @@ EOF
 export require='__package/jibri'
 __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?
-#   jicofo.conf.sh works the same way
-"${__type}/files/jibri.conf.sh" | \
-	__file '/etc/jitsi/jibri/jibri.conf' \
-		--mode '0444' --source '-' \
-		--onchange 'systemctl restart jibri.service'
-
-__systemd_unit 'jibri.service' \
-	--enablement-state 'enabled' \
-	--restart
+# shellcheck source=type/__jitsi_jibri/files/jibri.conf.sh
+. "${__type}/files/jibri.conf.sh"  # This defines JIBRI_CONFIG
+__file '/etc/jitsi/jibri/jibri.conf' \
+		--mode '0444'  \
+		--source '-' <<EOF
+${JIBRI_CONFIG}
+EOF
 
 # thanks https://community.jitsi.org/t/jibri-recording-resolution-to-record-a-full-window-at-720p-without-cropping/104442
-"${__type}/files/xorg-video-dummy.conf" | \
-	__file '/etc/jitsi/jibri/xorg-video-dummy.conf' \
-		--mode '0444' --source '-' \
-		--onchange 'systemctl restart jibri-xorg.service'
+# shellcheck source=type/__jitsi_jibri/files/xorg-video-dummy.conf
+. "${__type}/files/xorg-video-dummy.conf.sh"  # This defines JIBRI_XORG_CONFIG
+__file '/etc/jitsi/jibri/xorg-video-dummy.conf' \
+		--mode '0444'  \
+		--source '-' <<EOF
+${JIBRI_XORG_CONFIG}
+EOF
 
 __file '/opt/jitsi/jibri/launch.sh' \
 	--onchange 'systemctl daemon-reload && systemctl restart jibri.service' \
@@ -132,3 +129,6 @@ __file '/opt/jitsi/jibri/launch.sh' \
 
 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
+
+__systemd_unit 'jibri.service' \
+	--enablement-state 'enabled'