From 9bb2fbc85949ef00195299da5bffbe2a057d089e Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 19 Feb 2021 11:55:35 -0600 Subject: [PATCH 1/3] Add chrome flags as new version require ignore certs errors --- add-jibri-node.sh | 13 +++++++++++++ quick_jibri_installer.sh | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/add-jibri-node.sh b/add-jibri-node.sh index c2df403..2782034 100644 --- a/add-jibri-node.sh +++ b/add-jibri-node.sh @@ -312,6 +312,19 @@ mv $JIBRI_CONF ${JIBRI_CONF}-dpkg-file cat << NEW_CONF > $JIBRI_CONF // New XMPP environment config. jibri { + chrome { + // The flags which will be passed to chromium when launching + flags = [ + "--use-fake-ui-for-media-stream", + "--start-maximized", + "--kiosk", + "--enabled", + "--disable-infobars", + "--autoplay-policy=no-user-gesture-required", + "--ignore-certificate-errors", + "--disable-dev-shm-usage" + ] + } recording { recordings-directory = $DIR_RECORD finalize-script = $REC_DIR diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index e088afb..851ac7a 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -815,6 +815,19 @@ mv $JIBRI_CONF ${JIBRI_CONF}-dpkg-file cat << NEW_CONF > $JIBRI_CONF // New XMPP environment config. jibri { + chrome { + // The flags which will be passed to chromium when launching + flags = [ + "--use-fake-ui-for-media-stream", + "--start-maximized", + "--kiosk", + "--enabled", + "--disable-infobars", + "--autoplay-policy=no-user-gesture-required", + "--ignore-certificate-errors", + "--disable-dev-shm-usage" + ] + } recording { recordings-directory = $DIR_RECORD finalize-script = $REC_DIR From a4719d76776bfafa49fa777d0652d5790bef6e3e Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 19 Feb 2021 15:24:27 -0600 Subject: [PATCH 2/3] Add test to check for chrome flag --- tools/test-jibri-env.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/tools/test-jibri-env.sh b/tools/test-jibri-env.sh index 431d50e..27939a3 100644 --- a/tools/test-jibri-env.sh +++ b/tools/test-jibri-env.sh @@ -189,27 +189,39 @@ echo -e "What config version is this using?" if [ -f ${CONF_JSON}_disabled ] && \ [ -f $JIBRI_CONF ] && \ [ -f $JIBRI_CONF-dpkg-file ]; then - echo -e "\n> This jibri config has been upgraded already.\n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \ + echo -e "\n> This jibri config has been upgraded already. \xE2\x9C\x94 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \ https://github.com/switnet-ltd/quick-jibri-installer/issues\n" T6=1 elif [ ! -f $CONF_JSON ] && \ [ -f $JIBRI_CONF ] && \ [ -f ${JIBRI_CONF}-dpkg-file ]; then - echo -e "\n> This jibri seems to be running the lastest configuration already.\n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \ + echo -e "\n> This jibri seems to be running the lastest configuration already. \xE2\x9C\x94 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \ https://github.com/switnet-ltd/quick-jibri-installer/issues\n" T6=1 elif [ -f ${CONF_JSON} ] && \ [ -f $JIBRI_CONF ]; then - echo -e "\n> This jibri config seems to be candidate for upgrading.\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \ + echo -e "\n> This jibri config seems to be candidate for upgrading. \xE2\x9C\x96 \nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \ https://github.com/switnet-ltd/quick-jibri-installer/issues\n" T6=0 fi -TEST_TOTAL=$((T1 + T2 + T3 + T4 + T5 + T6)) +#T6.1 +echo -e "\n#6.1 -- Check for specific Chrome flag --\n" +if [ "$(grep -c "ignore-certificate-errors" $JIBRI_CONF)" != 0 ]; then + echo -e "\n> Seems you have the \"--ignore-certificate-errors\" flag required for Chrome v88 and later. \xE2\x9C\x94 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \ +https://github.com/switnet-ltd/quick-jibri-installer/issues\n" +T6_1="0.1" +else +echo -e "\n> The jibri config may be missing the required chrome flags. \xE2\x9C\x96 \nPlease check:\n https://github.com/switnet-ltd/quick-jibri-installer/blob/unstable/quick_jibri_installer.sh#L820 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \ +https://github.com/switnet-ltd/quick-jibri-installer/issues\n" +T6_1=0 +fi + +TEST_TOTAL=$(awk "BEGIN{ print $T1 + $T2 + $T3 + $T4 + $T5 + $T6 + $T6_1 }") echo " ########################### \ -Score: $TEST_TOTAL out of 6 +Score: $TEST_TOTAL out of 6.1 ########################### " echo -e "\nJibri Test complete, thanks for testing.\n" From 4b1473d5161bdef13faf716973ba66f4b78d2f91 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 19 Feb 2021 15:36:50 -0600 Subject: [PATCH 3/3] Update url --- tools/test-jibri-env.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/test-jibri-env.sh b/tools/test-jibri-env.sh index 27939a3..e7fc46a 100644 --- a/tools/test-jibri-env.sh +++ b/tools/test-jibri-env.sh @@ -212,16 +212,16 @@ if [ "$(grep -c "ignore-certificate-errors" $JIBRI_CONF)" != 0 ]; then https://github.com/switnet-ltd/quick-jibri-installer/issues\n" T6_1="0.1" else -echo -e "\n> The jibri config may be missing the required chrome flags. \xE2\x9C\x96 \nPlease check:\n https://github.com/switnet-ltd/quick-jibri-installer/blob/unstable/quick_jibri_installer.sh#L820 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \ +echo -e "\n> The jibri config may be missing the required chrome flags. \xE2\x9C\x96 \nPlease check:\n https://github.com/switnet-ltd/quick-jibri-installer/blob/master/quick_jibri_installer.sh#L820 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \ https://github.com/switnet-ltd/quick-jibri-installer/issues\n" T6_1=0 fi TEST_TOTAL=$(awk "BEGIN{ print $T1 + $T2 + $T3 + $T4 + $T5 + $T6 + $T6_1 }") echo " -########################### +############################## \ Score: $TEST_TOTAL out of 6.1 -########################### +############################## " echo -e "\nJibri Test complete, thanks for testing.\n"