Explorar el Código

jibri: don't provide a non-existing finalizer path

Saúl Ibarra Corretgé hace 4 años
padre
commit
a7fb101e2c
Se han modificado 3 ficheros con 4 adiciones y 1 borrados
  1. 1 1
      env.example
  2. 2 0
      jibri/rootfs/defaults/config.json
  3. 1 0
      jibri/rootfs/etc/cont-init.d/10-config

+ 1 - 1
env.example

@@ -333,7 +333,7 @@ JIBRI_RECORDER_USER=recorder
 JIBRI_RECORDING_DIR=/config/recordings
 
 # The finalizing script. Will run after recording is complete
-JIBRI_FINALIZE_RECORDING_SCRIPT_PATH=/config/finalize.sh
+#JIBRI_FINALIZE_RECORDING_SCRIPT_PATH=/config/finalize.sh
 
 # XMPP user for Jibri client connections
 JIBRI_XMPP_USER=jibri

+ 2 - 0
jibri/rootfs/defaults/config.json

@@ -1,7 +1,9 @@
 {
     "recording_directory":"{{ .Env.JIBRI_RECORDING_DIR }}",
     // The path to the script which will be run on completed recordings
+{{ if .Env.JIBRI_FINALIZE_RECORDING_SCRIPT_PATH -}}
     "finalize_recording_script_path": "{{ .Env.JIBRI_FINALIZE_RECORDING_SCRIPT_PATH }}",
+{{ end -}}
     "xmpp_environments": [
         {
             // A friendly name for this environment which can be used

+ 1 - 0
jibri/rootfs/etc/cont-init.d/10-config

@@ -39,6 +39,7 @@ usermod -aG ${host_audio_group} jibri
 
 # script for finalizing must have executing bit.
 [ ! -z "${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}" ] \
+&& [ -f "${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}" ] \
 && [ ! -x "${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}" ] \
 && chmod +x ${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}