From ce96029aed3c8f1fad6acdcde1039731975c3907 Mon Sep 17 00:00:00 2001 From: Aslan Date: Tue, 10 Jan 2023 11:34:01 +0300 Subject: [PATCH] fix repo names --- README.md | 7 +++---- etherpad-docker.sh | 6 ++---- grafana.sh | 3 +-- jra_nextcloud.sh | 6 ++---- mode/chp-mode.sh | 9 +++------ quick_jibri_installer.sh | 30 +++++++++++------------------- tools/jibri-conf-upgrade.sh | 9 +++------ tools/test-jibri-env.sh | 15 +++++---------- 8 files changed, 30 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 41af906..9485d38 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,7 @@ 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). +3. open ports for JMS interaction. 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 +73,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,7 +115,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. diff --git a/etherpad-docker.sh b/etherpad-docker.sh index e78be9c..67c92b8 100644 --- a/etherpad-docker.sh +++ b/etherpad-docker.sh @@ -113,8 +113,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 +131,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..08d5759 100644 --- a/grafana.sh +++ b/grafana.sh @@ -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/jra_nextcloud.sh b/jra_nextcloud.sh index e21e8a8..c0b32ca 100644 --- a/jra_nextcloud.sh +++ b/jra_nextcloud.sh @@ -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..e233f47 100644 --- a/mode/chp-mode.sh +++ b/mode/chp-mode.sh @@ -86,8 +86,7 @@ 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 +308,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 +316,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/quick_jibri_installer.sh b/quick_jibri_installer.sh index 4b3efa4..7388bf2 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -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" +" 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\n' 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 diff --git a/tools/jibri-conf-upgrade.sh b/tools/jibri-conf-upgrade.sh index efebb74..08065c9 100644 --- a/tools/jibri-conf-upgrade.sh +++ b/tools/jibri-conf-upgrade.sh @@ -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\nIf you think there maybe an error on checking you current jibri configuration.\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\nIf you think there maybe an error on checking you current jibri configuration.\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...\nIf you think there maybe an error on checking you current jibri configuration.\n\n" fi #Read missing variables diff --git a/tools/test-jibri-env.sh b/tools/test-jibri-env.sh index 9feffee..4c7c431 100644 --- a/tools/test-jibri-env.sh +++ b/tools/test-jibri-env.sh @@ -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\nIf you think there maybe an error on checking you current jibri configuration.\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\nIf you think there maybe an error on checking you current jibri configuration.\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 \nIf you think there maybe an error on checking you current jibri configuration.\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\nIf you think there maybe an error on checking you current jibri configuration.\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\nIf you think there maybe an error on checking you current jibri configuration.\n\n" T6_1=0 fi