diff --git a/add-jibri-node.sh b/add-jibri-node.sh index 6d56389..5b53d5f 100644 --- a/add-jibri-node.sh +++ b/add-jibri-node.sh @@ -52,7 +52,7 @@ REC_DIR="/home/jibri/finalize_recording.sh" GOOGL_REPO="/etc/apt/sources.list.d/dl_google_com_linux_chrome_deb.list" GOOGLE_ACTIVE_REPO=$(apt-cache policy | awk '/chrome/{print$3}' | awk -F "/" 'NR==1{print$2}') GCMP_JSON="/etc/opt/chrome/policies/managed/managed_policies.json" -#PUBLIC_IP="$(dig -4 +short myip.opendns.com @resolver1.opendns.com)" +#PUBLIC_IP="$(wget -qO- https://api.ipify.org)" JITSI_GPG_KEY="/etc/apt/trusted.gpg.d/jitsi-key.gpg.key" NJN_RAND_TAIL="$(tr -dc "a-zA-Z0-9" < /dev/urandom | fold -w 4 | head -n1)" NJN_USER="jbnode${ADDUP}_${NJN_RAND_TAIL}" diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh index c5414da..3703a35 100644 --- a/jra_nextcloud.sh +++ b/jra_nextcloud.sh @@ -59,7 +59,7 @@ DIR_RECORD="$(awk -F '"' '/RECORDING/{print$2}' /home/jibri/finalize_recording REDIS_CONF="/etc/redis/redis.conf" JITSI_MEET_PROXY="/etc/nginx/modules-enabled/60-jitsi-meet.conf" [ -f "$JITSI_MEET_PROXY" ] && PREAD_PROXY=$(grep -nr "preread_server_name" "$JITSI_MEET_PROXY" | cut -d ":" -f1) -PUBLIC_IP="$(dig -4 +short myip.opendns.com @resolver1.opendns.com)" +PUBLIC_IP="$(wget -qO- https://api.ipify.org)" ISO3166_CODE=TBD NL="$(printf '\n ')" diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index f33a9b4..4cf3ea7 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -38,7 +38,7 @@ DIST=$(lsb_release -sc) GOOGL_REPO="/etc/apt/sources.list.d/dl_google_com_linux_chrome_deb.list" GOOGLE_ACTIVE_REPO=$(apt-cache policy | awk '/chrome/{print$3}' | awk -F "/" 'NR==1{print$2}') PROSODY_REPO="$(apt-cache policy | awk '/prosody/{print$3}' | awk -F "/" 'NR==1{print$2}')" -PUBLIC_IP="$(dig -4 +short myip.opendns.com @resolver1.opendns.com)" +PUBLIC_IP="$(wget -qO- https://api.ipify.org)" NL="$(printf '\n ')" NODEJS_VER="18" JITSI_GPG_KEY="/etc/apt/trusted.gpg.d/jitsi-key.gpg.key" @@ -117,12 +117,6 @@ check_snd_driver() { var_dlim() { grep -n "$1" add-jibri-node.sh|head -n1|cut -d ":" -f1 } -add_gpg_keyring() { - apt-key adv --recv-keys --keyserver keyserver.ubuntu.com \$1 - apt-key export \$1 | gpg --dearmour | tee /tmp/\$1.gpg >/dev/null - apt-key del \$1 - mv /tmp/\$1.gpg /etc/apt/trusted.gpg.d/ -} add_prosody_repo() { echo "Add Prosody repo" if [ "$PROSODY_REPO" = "main" ]; then @@ -1054,7 +1048,6 @@ VirtualHost "guest.$DOMAIN" P_SR fi - #-------------------------------------------------- print_title "Custom settings" #--------------------------------------------------