From 11f39d83685a559a3a8fc11d16121f199d66397a Mon Sep 17 00:00:00 2001 From: Aslan Date: Tue, 10 Jan 2023 12:48:16 +0300 Subject: [PATCH] repo name fix --- .github/FUNDING.yml | 3 --- README.md | 7 ++----- add-jibri-node.sh | 6 +++--- add-jvb2-node.sh | 6 +++--- changelog | 18 ++++++++-------- deprecated/jigasi.sh | 1 - etherpad-docker.sh | 7 ++----- grafana.sh | 5 ++--- jitsi-updater.sh | 2 +- jm-bm.sh | 2 +- jra_nextcloud.sh | 8 +++----- mode/chp-mode.sh | 10 +++------ mode/grid/selenium-grid-docker.sh | 2 +- mode/jms-stu.sh | 2 +- mode/jwt.sh | 2 +- quick_jibri_installer.sh | 33 +++++++++++------------------- tools/aws-grub-setup.sh | 2 +- tools/fail2ban_ssh.sh | 2 +- tools/jibri-conf-upgrade.sh | 11 ++++------ tools/jibri-resolution-enhancer.sh | 2 +- tools/start-over.sh | 2 +- tools/test-jibri-env.sh | 17 ++++++--------- 22 files changed, 58 insertions(+), 92 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 611be71..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -# These are supported funding model platforms - -custom: ["https://www.paypal.me/switnet", switnet.net] diff --git a/README.md b/README.md index 41af906..a0514dc 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ As for our current latest release, as we have integrated more and more features, Login into your clean server, clone git repository and run the installer, ``` -git clone https://github.com/switnet-ltd/quick-jibri-installer +git clone https://github.com/codex-ist/quick-jibri-installer cd quick-jibri-installer sudo bash quick_jibri_installer.sh ``` @@ -48,7 +48,6 @@ Check more details on our wiki. ## Requirements 1. Clean VM/VPS/Server using a supported Ubuntu LTS 2. Valid domain with DNS record, **mandatory** for SSL certs via Let's Encrypt. -3. open ports for JMS interaction, [see wiki](https://github.com/switnet-ltd/quick-jibri-installer/wiki/Firewall). 4. Starting at 8 GB RAM / 4 Cores @ ~3.0GHz * Adding resources as your audience or features you require, so your experience don't suffer from the lack of resources. 5. Webcam @@ -73,7 +72,7 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre * Enabled Session Recording via Jibri * Rename Jibri folder with name room + date. * Jibri node network. - * Automatic Jibri nodes network sync ([see more](https://github.com/switnet-ltd/quick-jibri-installer/wiki/Setup-and-Jibri-Nodes)). + * Automatic Jibri nodes network sync. * JRA (Jibri Recordings Access) via Nextcloud * Grafana Dashboard * Etherpad via docker install @@ -115,8 +114,6 @@ Feel free to use our `test-jibri-env.sh` tool to find some details on your curre ## Documentation -* Please check our [wiki](https://github.com/switnet-ltd/quick-jibri-installer/wiki) for further documentation. Please note: This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. -SwITNet Ltd © - 2022, https://switnet.net/ diff --git a/add-jibri-node.sh b/add-jibri-node.sh index 80652e9..d2f4af6 100644 --- a/add-jibri-node.sh +++ b/add-jibri-node.sh @@ -1,6 +1,6 @@ #!/bin/bash # Jibri Node Aggregator -# SwITNet Ltd © - 2022, https://switnet.net/ + # GPLv3 or later. ### 0_LAST EDITION TIME STAMP ### @@ -60,7 +60,7 @@ NJN_RAND_TAIL="$(tr -dc "a-zA-Z0-9" < /dev/urandom | fold -w 4 | head -n1)" NJN_USER="jbnode${ADDUP}_${NJN_RAND_TAIL}" NJN_USER_PASS="$(tr -dc "a-zA-Z0-9#_*=" < /dev/urandom | fold -w 32 | head -n1)" GITHUB_RAW="https://raw.githubusercontent.com" -GIT_REPO="switnet-ltd/quick-jibri-installer" +GIT_REPO="codex-ist/quick-jibri-installer" TEST_JIBRI_ENV="$GITHUB_RAW/$GIT_REPO/unstable/tools/test-jibri-env.sh" SHORT_ID="$(awk '{print substr($0,0,7)}' /etc/machine-id)" JIBRI_XORG_CONF="/etc/jitsi/jibri/xorg-video-dummy.conf" @@ -554,7 +554,7 @@ echo " ######################################################################## Node addition complete!! - For customized support: http://switnet.net + ######################################################################## " diff --git a/add-jvb2-node.sh b/add-jvb2-node.sh index d94ab67..dd49979 100644 --- a/add-jvb2-node.sh +++ b/add-jvb2-node.sh @@ -1,6 +1,6 @@ #!/bin/bash # JVB2 Node Aggregator -# SwITNet Ltd © - 2022, https://switnet.net/ + # GPLv3 or later. ### 0_LAST EDITION TIME STAMP ### @@ -67,7 +67,7 @@ JVB2_SIP="/etc/jitsi/videobridge/sip-communicator.properties" SHORT_ID="$(awk '{print substr($0,0,7)}' /etc/machine-id)" #PUBLIC_IP="$(dig -4 @resolver1.opendns.com ANY myip.opendns.com +short)" #GITHUB_RAW="https://raw.githubusercontent.com" -#GIT_REPO="switnet-ltd/quick-jibri-installer" +#GIT_REPO="codex-ist/quick-jibri-installer" ### 1_VAR_DEF # sed limiters for add-jvb2-node.sh variables @@ -295,7 +295,7 @@ echo " ######################################################################## Node addition complete!! - For customized support: http://switnet.net + ######################################################################## " diff --git a/changelog b/changelog index 29fcc08..40ebf98 100644 --- a/changelog +++ b/changelog @@ -4,52 +4,52 @@ quick-jibri-installer (7.0.8) * add-jibri-node.sh: set openjdk-jre-headless default version to 11 * changelog: add changelog --- Software, IT & Networks Tue Nov 15 02:56:26 2022 -0600 + quick-jibri-installer (7.0.7) * quick_jibri_installer.sh: fix jaas & acme integration --- Software, IT & Networks Sun Oct 23 23:52:23 2022 -0500 + quick-jibri-installer (7.0.6) * jitsi-updater.sh: fix jitsi repo package update filtering. --- Software, IT & Networks Fri Sep 30 04:04:31 2022 -0500 + quick-jibri-installer (7.0.5) * quick_jibri_installer.sh: use new setup to enable local recording feature. --- Software, IT & Networks Fri Aug 19 07:23:41 2022 -0500 + quick-jibri-installer (7.0.4) * quick_jibri_installer.sh,jwt.sh: update anonymous string on prosody setup. -fix small format issues. --- Software, IT & Networks Fri Aug 19 06:47:21 2022 -0500 + quick-jibri-installer (7.0.3) * jitsi-updater: fix condition to set turn config. * quick-jibri-installer: fix typo on path. --- Software, IT & Networks Thu Jun 30 09:57:12 2022 -0500 + quick-jibri-installer (7.0.2) * Detect jibri node by jitsi-updater. --- Software, IT & Networks Fri Jun 17 16:36:15 2022 -0500 + quick-jibri-installer (7.0.1) * Fix debug mode on triggered scripts. * Fix grep condition. --- Software, IT & Networks Mon May 23 23:17:39 2022 -0500 + quick-jibri-installer (7.0) @@ -87,4 +87,4 @@ quick-jibri-installer (7.0) * Remove unused code * Finally remove jigasi deprecated script. --- Software, IT & Networks Fri May 20 20:07:02 2022 -0500 + diff --git a/deprecated/jigasi.sh b/deprecated/jigasi.sh index ed5d7b1..36244b2 100644 --- a/deprecated/jigasi.sh +++ b/deprecated/jigasi.sh @@ -1,6 +1,5 @@ #!/bin/bash # Quick Jigasi Installer - *buntu (LTS) based systems. -# SwITNet Ltd © - 2020, https://switnet.net/ # GPLv3 or later. ##################### Whistlist ####################### diff --git a/etherpad-docker.sh b/etherpad-docker.sh index e78be9c..9687161 100644 --- a/etherpad-docker.sh +++ b/etherpad-docker.sh @@ -1,6 +1,5 @@ #!/bin/bash # Etherpad Installer for Jitsi Meet -# SwITNet Ltd © - 2020, https://switnet.net/ # # GPLv3 or later. @@ -113,8 +112,7 @@ elif [ -f "$WS_CONF" ]; then sed -i "/# ensure all static content can always be found first/i \ \ \ \ }" "$WS_CONF" sed -i "/# ensure all static content can always be found first/i \\\n" "$WS_CONF" else - echo "> No etherpad config done to server file, please report to: - -> https://github.com/switnet-ltd/quick-jibri-installer/issues" + echo "> No etherpad config done to server file" fi # Configure config.js @@ -132,6 +130,5 @@ if nginx -t 2>/dev/null ; then # systemctl reload nginx else echo "Please check your configuration, something may be wrong." - echo "Will not try to enable etherpad nginx configuration, please report to: - -> https://github.com/switnet-ltd/quick-jibri-installer/issues" + echo "Will not try to enable etherpad nginx configuration" fi diff --git a/grafana.sh b/grafana.sh index 029a9a8..3bbfc90 100644 --- a/grafana.sh +++ b/grafana.sh @@ -8,7 +8,7 @@ # by "mephisto" # # Igor Kerstges © - 2021 -# SwITNet Ltd © - 2022, https://switnet.net/ + # # GPLv3 or later. @@ -167,8 +167,7 @@ if [ -f "$WS_CONF" ]; then sed -i "/# ensure all static content can always be found first/i \\\n" "$WS_CONF" systemctl restart nginx else - echo "No app configuration done to server file, please report to: - -> https://github.com/switnet-ltd/quick-jibri-installer/issues" + echo "No app configuration done to server file" fi echo " diff --git a/jitsi-updater.sh b/jitsi-updater.sh index 5dd9f83..62cd5ef 100644 --- a/jitsi-updater.sh +++ b/jitsi-updater.sh @@ -1,7 +1,7 @@ #!/bin/bash # Jitsi Meet recurring upgrader and customization keeper # for Debian/*buntu binaries. -# SwITNet Ltd © - 2022, https://switnet.net/ + # GNU GPLv3 or later. while getopts m: option diff --git a/jm-bm.sh b/jm-bm.sh index 9fb3a9e..a8fdd42 100644 --- a/jm-bm.sh +++ b/jm-bm.sh @@ -1,7 +1,7 @@ #!/bin/bash # Jitsi Meet brandless mode # for Debian/*buntu binaries. -# SwITNet Ltd © - 2022, https://switnet.net/ + # GNU GPLv3 or later. while getopts m: option diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh index e21e8a8..4ca3dff 100644 --- a/jra_nextcloud.sh +++ b/jra_nextcloud.sh @@ -1,6 +1,6 @@ #!/bin/bash # JRA (Jibri Recordings Access) via Nextcloud -# SwITNet Ltd © - 2022, https://switnet.net/ + # GPLv3 or later. while getopts m: option @@ -24,8 +24,7 @@ fi exit_if_not_installed() { if [ "$(dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed")" != "1" ]; then echo " This instance doesn't have $1 installed, exiting..." - echo " If you think this is an error, please report to: - -> https://github.com/switnet-ltd/quick-jibri-installer/issues " + echo " If you think this is an error " exit fi } @@ -151,8 +150,7 @@ fi exit_ifinstalled() { if [ "$(dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed")" == "1" ]; then echo " This instance already has $1 installed, exiting..." - echo " If you think this is an error, please report to: - -> https://github.com/switnet-ltd/quick-jibri-installer/issues " + echo " If you think this is an error " exit fi } diff --git a/mode/chp-mode.sh b/mode/chp-mode.sh index 8c7f829..0fdacfd 100644 --- a/mode/chp-mode.sh +++ b/mode/chp-mode.sh @@ -1,6 +1,6 @@ #!/bin/bash # Custom High Performance Jitsi conf -# SwITNet Ltd © - 2022, https://switnet.net/ + # GPLv3 or later. while getopts m: option @@ -86,8 +86,6 @@ Overview: echo "# Note: As for January 2021 Firefox can't handle correctly widescreen sizing # on lower resolution than HD (nHD & qHD), setting as incompatible for now. -# (If you know this is no longer the case. Please report it to \ -https://github.com/switnet-ltd/quick-jibri-installer/issues) " #Tools to consider @@ -309,8 +307,7 @@ echo -e "\n# The $MEET_CONF_HP configuration seems correct. =)\n" else echo -e "\n Watch out!, there seems to be an issue on $MEET_CONF_HP line: $CHECKJS_MEET_CHP - Most of the times this is due upstream changes, please report to - https://github.com/switnet-ltd/quick-jibri-installer/issues\n" + Most of the times this is due upstream changes\n" fi CHECKJS_INT_CHP="$(esvalidate "$INT_CONF_JS_HP"| cut -d ":" -f2)" if [ -z "$CHECKJS_INT_CHP" ]; then @@ -318,8 +315,7 @@ echo -e "\n# The $INT_CONF_JS_HP configuration seems correct. =)\n" else echo -e "\n Watch out!, there seems to be an issue on $INT_CONF_JS_HP line: $CHECKJS_INT_CHP - Most of the times this is due upstream changes, please report to - https://github.com/switnet-ltd/quick-jibri-installer/issues\n" + Most of the times this is due upstream changes\n" fi sed -i "s|$MEET_CONF|$MEET_CONF_HP|g" "$WS_CONF" diff --git a/mode/grid/selenium-grid-docker.sh b/mode/grid/selenium-grid-docker.sh index 868efd4..34597b9 100644 --- a/mode/grid/selenium-grid-docker.sh +++ b/mode/grid/selenium-grid-docker.sh @@ -1,7 +1,7 @@ #!/bin/bash # Custom Selenium Grid-Node fro Jitsi Meet # Pandian © - https://community.jitsi.org/u/Pandian -# SwITNet Ltd © - 2022, https://switnet.net/ + # GPLv3 or later. while getopts m: option diff --git a/mode/jms-stu.sh b/mode/jms-stu.sh index 2eb4e2d..40e7b1c 100644 --- a/mode/jms-stu.sh +++ b/mode/jms-stu.sh @@ -2,7 +2,7 @@ # System-tune-up to remove system software restrictions on a huge load of connections. # Be aware that hardware/infrastructure resources are the most common limiters. # -# SwITNet Ltd © - 2022, https://switnet.net/ + # GPLv3 or later. while getopts m: option diff --git a/mode/jwt.sh b/mode/jwt.sh index 9c3ae62..4afdc02 100644 --- a/mode/jwt.sh +++ b/mode/jwt.sh @@ -1,6 +1,6 @@ #!/bin/bash # JWT Mode Setup -# SwITNet Ltd © - 2022, https://switnet.net/ + # GPLv3 or later. while getopts m: option diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index 4b3efa4..3c4f7f5 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -1,6 +1,6 @@ #!/bin/bash # Quick Jibri Installer - *buntu (LTS) based systems. -# SwITNet Ltd © - 2022, https://switnet.net/ + # GPLv3 or later. { echo "Started at $(date +'%Y-%m-%d %H:%M:%S')" >> qj-installer.log @@ -35,8 +35,7 @@ if [ "$(dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed")" echo " This instance already has $1 installed, exiting... Please try again on a clean system. - If you think this is an error, please report to: - -> https://github.com/switnet-ltd/quick-jibri-installer/issues" + If you think this is an error" exit fi } @@ -138,8 +137,7 @@ Featuring: - Recurring changes updater Learn more about these at, -Main repository: https://github.com/switnet-ltd/quick-jibri-installer -Wiki and documentation: https://github.com/switnet-ltd/quick-jibri-installer/wiki\n' +Main repository: https://github.com/codex-ist/quick-jibri-installer read -n 1 -s -r -p "Press any key to continue..."$'\n' @@ -343,8 +341,7 @@ if [ "$LE_SSL" = "yes" ]; then apt-get -y install \ letsencrypt if [ "$(dpkg-query -W -f='${Status}' ufw 2>/dev/null | grep -c "ok installed")" == "1" ]; then - echo "# Disable pre-installed ufw, more on firewall see: - > https://github.com/switnet-ltd/quick-jibri-installer/wiki/Firewall" + echo "# Disable pre-installed ufw." ufw disable fi fi @@ -622,7 +619,7 @@ fi while [ "$ENABLE_NC_ACCESS" != "yes" ] && [ "$ENABLE_NC_ACCESS" != "no" ] do read -p "> Do you want to setup Jibri Records Access via Nextcloud: (yes or no) -( Please check requirements at: https://github.com/switnet-ltd/quick-jibri-installer )$NL" -r ENABLE_NC_ACCESS +( Please check requirements at: https://github.com/codex-ist/quick-jibri-installer )$NL" -r ENABLE_NC_ACCESS if [ "$ENABLE_NC_ACCESS" = "no" ]; then printf " - JRA via Nextcloud won't be enabled.\n\n" elif [ "$ENABLE_NC_ACCESS" = "yes" ]; then @@ -638,7 +635,7 @@ elif [ "$(curl -s -o /dev/null -w "%{http_code}" "$GC_SDK_REL_FILE" )" == "200" while [ "$ENABLE_TRANSCRIPT" != "yes" ] && [ "$ENABLE_TRANSCRIPT" != "no" ] do read -p "> Do you want to setup Jigasi Transcription: (yes or no) -( Please check requirements at: https://github.com/switnet-ltd/quick-jibri-installer )$NL" -r ENABLE_TRANSCRIPT +( Please check requirements at: https://github.com/codex-ist/quick-jibri-installer )$NL" -r ENABLE_TRANSCRIPT if [ "$ENABLE_TRANSCRIPT" = "no" ]; then printf " - Jigasi Transcription won't be enabled.\n\n" elif [ "$ENABLE_TRANSCRIPT" = "yes" ]; then @@ -646,15 +643,14 @@ elif [ "$(curl -s -o /dev/null -w "%{http_code}" "$GC_SDK_REL_FILE" )" == "200" fi done else - echo "No valid option for Jigasi. Please report this to -https://github.com/switnet-ltd/quick-jibri-installer/issues" + echo "No valid option for Jigasi." fi sleep .1 #Grafana while [ "$ENABLE_GRAFANA_DSH" != "yes" ] && [ "$ENABLE_GRAFANA_DSH" != "no" ] do read -p "> Do you want to setup Grafana Dashboard: (yes or no) -( Please check requirements at: https://github.com/switnet-ltd/quick-jibri-installer )$NL" -r ENABLE_GRAFANA_DSH +( Please check requirements at: https://github.com/codex-ist/quick-jibri-installer )$NL" -r ENABLE_GRAFANA_DSH if [ "$ENABLE_GRAFANA_DSH" = "no" ]; then printf " - Grafana Dashboard won't be enabled.\n\n" elif [ "$ENABLE_GRAFANA_DSH" = "yes" ]; then @@ -1049,8 +1045,7 @@ if [ -f "$WS_CONF" ]; then sed -i "/# ensure all static content can always be found first/i \\\n" "$WS_CONF" systemctl reload nginx else - echo "No app configuration done to server file, please report to: - -> https://github.com/switnet-ltd/quick-jibri-installer/issues" + echo "No app configuration done to server file" fi #Static avatar if [ "$ENABLE_SA" = "yes" ] && [ -f "$WS_CONF" ]; then @@ -1069,8 +1064,7 @@ if [ "$DROP_TLS1" = "yes" ];then elif [ "$DROP_TLS1" = "no" ];then printf "\nNo TLSv1/1.1 dropping was done.\n\n" else - echo "No condition meet, please report to -https://github.com/switnet-ltd/quick-jibri-installer/issues " + echo "No condition meet." fi sleep .1 #================== Setup prosody conf file ================= @@ -1176,8 +1170,7 @@ if [ -z "$CHECKJS" ]; then else echo -e "\nWatch out!, there seems to be an issue on $MEET_CONF line: $CHECKJS -Most of the times this is due upstream changes, please report to -https://github.com/switnet-ltd/quick-jibri-installer/issues\n" +Most of the times this is due upstream changes.\n" fi #Enable jibri services @@ -1231,8 +1224,7 @@ if [ -f "$WS_CONF" ]; then sed -i "/external_api.js/i \\\n" "$WS_CONF" systemctl reload nginx else - echo "No interface_config.js configuration done to server file, please report to: - -> https://github.com/switnet-ltd/quick-jibri-installer/issues" + echo "No interface_config.js configuration done to server file" fi #JRA via Nextcloud if [ "$ENABLE_NC_ACCESS" = "yes" ]; then @@ -1278,7 +1270,6 @@ check_snd_driver echo " ######################################################################## Installation complete!! - for customized support: http://switnet.net ######################################################################## " apt-get -y autoremove diff --git a/tools/aws-grub-setup.sh b/tools/aws-grub-setup.sh index f485fdb..07fe563 100644 --- a/tools/aws-grub-setup.sh +++ b/tools/aws-grub-setup.sh @@ -1,6 +1,6 @@ #!/bin/bash # Automated AWS generic kernel setup for jibri. -# SwITNet Ltd © - 2022, https://switnet.net/ + # GPLv3 or later. while getopts m: option diff --git a/tools/fail2ban_ssh.sh b/tools/fail2ban_ssh.sh index 6e03f03..9699dbf 100644 --- a/tools/fail2ban_ssh.sh +++ b/tools/fail2ban_ssh.sh @@ -1,6 +1,6 @@ #!/bin/bash # Simple Fail2ban configuration -# SwITNet Ltd © - 2022, https://switnet.net/ + # GNU GPLv3 or later. while getopts m: option diff --git a/tools/jibri-conf-upgrade.sh b/tools/jibri-conf-upgrade.sh index efebb74..26c5d80 100644 --- a/tools/jibri-conf-upgrade.sh +++ b/tools/jibri-conf-upgrade.sh @@ -1,6 +1,6 @@ #!/bin/bash # Simple Jibri conf updater -# SwITNet Ltd © - 2022, https://switnet.net/ + # GNU GPLv3 or later. while getopts m: option @@ -76,19 +76,16 @@ fi if [ -f "$CONF_JSON"_disabled ] && \ [ -f "$JIBRI_CONF" ] && \ [ -f "$JIBRI_CONF"-dpkg-file ]; then - echo -e "\n> This jibri config has been upgraded already, we'll exit...\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" + echo -e "\n> This jibri config has been upgraded already, we'll exit...\n\n\n" exit elif [ ! -f "$CONF_JSON" ] && \ [ -f "$JIBRI_CONF" ] && \ [ -f "$JIBRI_CONF"-dpkg-file ]; then - echo -e "\n> This jibri seems to be running the latest configuration already, we'll exit...\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" + echo -e "\n> This jibri seems to be running the latest configuration already, we'll exit...\n\n\n" exit elif [ -f "$CONF_JSON" ] && \ [ -f "$JIBRI_CONF" ]; then - echo -e "\n> This jibri config seems to be candidate for upgrading, we'll continue...\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" + echo -e "\n> This jibri config seems to be candidate for upgrading, we'll continue...\n\n" fi #Read missing variables diff --git a/tools/jibri-resolution-enhancer.sh b/tools/jibri-resolution-enhancer.sh index 4503ecb..35c4caa 100644 --- a/tools/jibri-resolution-enhancer.sh +++ b/tools/jibri-resolution-enhancer.sh @@ -1,6 +1,6 @@ #!/bin/bash # Simple Jibri resolution enhancer -# SwITNet Ltd © - 2022, https://switnet.net/ + # GNU GPLv3 or later. while getopts m: option diff --git a/tools/start-over.sh b/tools/start-over.sh index 256bb54..1d8d139 100644 --- a/tools/start-over.sh +++ b/tools/start-over.sh @@ -1,6 +1,6 @@ #!/bin/bash #Start over -# SwITNet Ltd © - 2022, https://switnet.net/ + # GPLv3 or later. while getopts m: option diff --git a/tools/test-jibri-env.sh b/tools/test-jibri-env.sh index 9feffee..87dc59b 100644 --- a/tools/test-jibri-env.sh +++ b/tools/test-jibri-env.sh @@ -1,6 +1,6 @@ #!/bin/bash # Simple Jibri Env tester -# SwITNet Ltd © - 2022, https://switnet.net/ + # GNU GPLv3 or later. while getopts m: option @@ -190,31 +190,26 @@ 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. \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" + echo -e "\n> This jibri config has been upgraded already. \xE2\x9C\x94 \n\n\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 latest 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" + echo -e "\n> This jibri seems to be running the latest configuration already. \xE2\x9C\x94 \n\n\n" T6=1 elif [ -f "${CONF_JSON}" ] && \ [ -f "$JIBRI_CONF" ]; then - 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" + echo -e "\n> This jibri config seems to be candidate for upgrading. \xE2\x9C\x96 \n\n" T6=0 fi #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" + echo -e "\n> Seems you have the \"--ignore-certificate-errors\" flag required for Chrome v88 and later. \xE2\x9C\x94 \n\n\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/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" +echo -e "\n> The jibri config may be missing the required chrome flags. \xE2\x9C\x96 \nPlease check:\n https://github.com/codex-ist/quick-jibri-installer/blob/master/quick_jibri_installer.sh#L820 \n\n\n" T6_1=0 fi