Merge pull request 'v7.4' (#110) from Ark74/quick-jibri-installer:wip_qji_7.4 into master

Reviewed-on: #110

etherpad-docker.sh

@@ -30,7 +30,7 @@ echo '
 ########################################################################
                     by Software, IT & Networks Ltd
 '
-
+FORGE_REPO="https://forge.switnet.net/switnet/quick-jibri-installer"
 check_apt_policy() {
 apt-cache policy 2>/dev/null| awk "/$1/{print \$3}" | awk -F '/' 'NR==1{print$2}'
 }
@@ -42,6 +42,16 @@ if [ "$(dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed")"
         apt-get -yq2 install "$1"
 fi
 }
+# Test for matches
+test_match() {
+if grep -q "$1" "$2" ; then
+    echo "$(basename "$2") - OK..."
+else
+    echo "$(basename "$2"), FAIL..."
+    echo "Please report this to $FORGE_REPO"
+    exit
+fi
+}
 DOMAIN="$(find /etc/prosody/conf.d/ -name \*.lua|awk -F'.cfg' '!/localhost/{print $1}'|xargs basename)"
 MEET_CONF="/etc/jitsi/meet/$DOMAIN-config.js"
 WS_CONF="/etc/nginx/sites-available/$DOMAIN.conf"
@@ -50,6 +60,7 @@ ETHERPAD_DB_USER="dockerpad"
 ETHERPAD_DB_NAME="etherpad"
 ETHERPAD_DB_PASS="$(tr -dc "a-zA-Z0-9#*=" < /dev/urandom | fold -w 10 | head -n1)"
 DOCKER_CE_REPO="$(check_apt_policy docker)"
+WS_CONF_MATCH1="# ensure all static content can always be found first"
 
 echo "Add Docker repo"
 if [ "$DOCKER_CE_REPO" = "stable" ]; then
@@ -105,14 +116,14 @@ if [ "$(grep -c etherpad "$WS_CONF")" != 0 ]; then
     echo "> Webserver seems configured, skipping..."
 elif [ -f "$WS_CONF" ]; then
     echo "> Setting up webserver configuration file..."
-    sed -i "/# ensure all static content can always be found first/i \ \ \ \ #Etherpad block" "$WS_CONF"
-    sed -i "/# ensure all static content can always be found first/i \ \ \ \ location \^\~\ \/etherpad\/ {" "$WS_CONF"
-    sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ proxy_pass http:\/\/localhost:9001\/;" "$WS_CONF"
-    sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ proxy_set_header X-Forwarded-For \$remote_addr;" "$WS_CONF"
-    sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ proxy_buffering off;" "$WS_CONF"
-    sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ proxy_set_header       Host \$host;" "$WS_CONF"
-    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"
+    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ #Etherpad block" "$WS_CONF"
+    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ location \^\~\ \/etherpad\/ {" "$WS_CONF"
+    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_pass http:\/\/localhost:9001\/;" "$WS_CONF"
+    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_set_header X-Forwarded-For \$remote_addr;" "$WS_CONF"
+    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_buffering off;" "$WS_CONF"
+    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_set_header       Host \$host;" "$WS_CONF"
+    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ }" "$WS_CONF"
+    sed -i "/$WS_CONF_MATCH1/i \\\n" "$WS_CONF"
 else
     echo "> No etherpad config done to server file, please report to:
     -> https://forge.switnet.net/switnet/quick-jibri-installer/issues"

grafana.sh

@@ -43,11 +43,22 @@ systemctl enable "$1"
 systemctl restart "$1"
 systemctl status "$1"
 }
+test_match() {
+    if grep -q "$1" "$2" ; then
+        echo "$(basename "$2") - OK..."
+    else
+        echo "$(basename "$2"), FAIL..."
+        echo "Please report this to https://forge.switnet.net/switnet/quick-jibri-installer"
+        exit
+    fi
+}
 MAIN_TEL="/etc/telegraf/telegraf.conf"
 TEL_JIT="/etc/telegraf/telegraf.d/jitsi.conf"
 GRAFANA_INI="/etc/grafana/grafana.ini"
 DOMAIN="$(find /etc/prosody/conf.d/ -name \*.lua|awk -F'.cfg' '!/localhost/{print $1}'|xargs basename)"
 WS_CONF="/etc/nginx/sites-available/$DOMAIN.conf"
+WS_MATCH1="# ensure all static content can always be found first"
+WS_MATCH2="upstream prosody {"
 GRAFANA_PASS="$(tr -dc "a-zA-Z0-9#_*=" < /dev/urandom | fold -w 14 | head -n1)"
 
 # Min requirements
@@ -57,11 +68,17 @@ apt-get install -y gnupg2 \
                    wget \
                    jq
 
+# Make sure we can rely on the match strings.
+printf "> Testing match strings on config files.\n"
+test_match "$WS_MATCH1" "$WS_CONF"
+
 echo "
 # Setup InfluxDB Packages
 "
-curl -s https://repos.influxdata.com/influxdata-archive.key > /etc/apt/trusted.gpg.d/influxdata-archive.key
-echo "deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.key] https://repos.influxdata.com/debian buster stable" | sudo tee /etc/apt/sources.list.d/influxdb.list
+curl -s https://repos.influxdata.com/influxdata-archive.key > \
+    /etc/apt/trusted.gpg.d/influxdata-archive.key
+echo "deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.key] https://repos.influxdata.com/debian buster stable" | \
+    sudo tee /etc/apt/sources.list.d/influxdb.list
 apt-get update && apt-get install influxdb -y
 run_service influxdb
 
@@ -70,7 +87,8 @@ echo "
 "
 curl -s https://apt.grafana.com/gpg-full.key | \
 gpg --dearmor | tee /etc/apt/trusted.gpg.d/grafana-full-key.gpg  >/dev/null
-add-apt-repository "deb https://packages.grafana.com/oss/deb stable main"
+echo "deb https://packages.grafana.com/oss/deb stable main" | \
+    sudo tee /etc/apt/sources.list.d/grafana_com_oss_deb.list
 apt-get update && apt-get install grafana -y
 run_service grafana-server
 
@@ -138,11 +156,13 @@ echo '
 # extra options to pass to the JVB daemon
 JVB_OPTS="--apis=rest,xmpp"' >>  /etc/jitsi/videobridge/config
 sed -i "s|TRANSPORT=muc|TRANSPORT=muc,colibri|" /etc/jitsi/videobridge/sip-communicator.properties
+# Enable videobridge REST API
+hocon -f /etc/jitsi/videobridge/jvb.conf set videobridge.apis.rest.enabled true
 systemctl restart jitsi-videobridge2
 
 echo -e "\n# Setup Grafana nginx domain\n"
 sed -i "s|;protocol =.*|protocol = http|" $GRAFANA_INI
-sed -i "s|;http_addr =.*|http_addr = localhost|" $GRAFANA_INI
+sed -i "s|;http_addr =.*|http_addr = 127.0.0.1|" $GRAFANA_INI
 sed -i "s|;http_port =.*|http_port = 3000|" $GRAFANA_INI
 sed -i "s|;domain =.*|domain = $DOMAIN|" $GRAFANA_INI
 sed -i "s|;enforce_domain =.*|enforce_domain = false|" $GRAFANA_INI
@@ -160,10 +180,30 @@ while [ $secs -gt 0 ]; do
 done
 
 if [ -f "$WS_CONF" ]; then
-    sed -i "/# ensure all static content can always be found first/i \ \ \ \ location \~ \^\/(grafana\/|grafana\/login) {" "$WS_CONF"
-    sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ proxy_pass http:\/\/localhost:3000;" "$WS_CONF"
-    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"
+    sed -i "/$WS_MATCH1/i \ \ \ \ # Proxy Grafana." "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ location ~ ^/(grafana/|grafana/login) {" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_set_header Host \$host;" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_pass http://grafana;" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ }" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \\\n" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ # Proxy Grafana Live WebSocket connections." "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ location /grafana/api/live/ {" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_http_version 1.1;" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_set_header Upgrade \$http_upgrade;" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_set_header Connection \$connection_upgrade;" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_set_header Host \$host;" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ \ \ proxy_pass http://grafana;" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \ \ \ \ }" "$WS_CONF"
+
+    sed -i "/$WS_MATCH2/i # This is required to proxy Grafana Live WebSocket connections." "$WS_CONF"
+    sed -i "/$WS_MATCH2/i map \$http_upgrade \$connection_upgrade {" "$WS_CONF"
+    sed -i "/$WS_MATCH2/i \ \ default upgrade;" "$WS_CONF"
+    sed -i "/$WS_MATCH2/i \ \ '' close;" "$WS_CONF"
+    sed -i "/$WS_MATCH2/i }" "$WS_CONF"
+    sed -i "/$WS_MATCH1/i \\\n" "$WS_CONF"
+    sed -i "/$WS_MATCH2/i upstream grafana {" "$WS_CONF"
+    sed -i "/$WS_MATCH2/i \ \ server localhost:3000;" "$WS_CONF"
+    sed -i "/$WS_MATCH2/i }" "$WS_CONF"
     systemctl restart nginx
 else
     echo "No app configuration done to server file, please report to:
@@ -179,7 +219,7 @@ PUT -H "Content-Type: application/json;charset=UTF-8" -d \
   \"oldPassword\": \"admin\",
   \"newPassword\": \"$GRAFANA_PASS\",
   \"confirmNew\": \"$GRAFANA_PASS\"
-}" http://localhost:3000/api/user/password; echo ""
+}" http://127.0.0.1:3000/api/user/password; echo ""
 
 echo "
 # Create InfluxDB datasource
@@ -189,16 +229,16 @@ POST -H 'Content-Type: application/json;charset=UTF-8' -d \
 '{
     "name": "InfluxDB",
     "type": "influxdb",
-    "url": "http://localhost:8086",
+    "url": "http://127.0.0.1:8086",
     "access": "proxy",
     "isDefault": true,
     "database": "jitsi"
-}' http://localhost:3000/api/datasources; echo ""
+}' http://127.0.0.1:3000/api/datasources; echo ""
 
 echo "
 # Add Grafana Dashboard
 "
-grafana_host="http://localhost:3000"
+grafana_host="http://127.0.0.1:3000"
 grafana_cred="admin:$GRAFANA_PASS"
 grafana_datasource="InfluxDB"
 ds=(11969);

images/watermark2.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="1" height="1"/>

jm-bm.sh

@@ -27,6 +27,7 @@ BUNDLE_JS="/usr/share/jitsi-meet/libs/app.bundle.min.js"
 #
 JM_IMG_PATH="/usr/share/jitsi-meet/images"
 WTM2_PATH="$JM_IMG_PATH/watermark2.png"
+WTM2_SVG_PATH="$JM_IMG_PATH/watermark2.svg"
 FICON_PATH="$JM_IMG_PATH/favicon2.ico"
 REC_ICON_PATH="$JM_IMG_PATH/gnome_record.png"
 #
@@ -36,29 +37,30 @@ PART_USER="Participant"
 LOCAL_USER="me"
 #
 #SEC_ROOM="TBD"
+copy_if_not_there() {
+	if [ ! -f "$1" ]; then
+        cp images/"$(echo $1|xargs basename)" "$1"
+    else
+        echo "$(echo $1|xargs basename) file exists, skipping copying..."
+    fi
+}
 echo '
 #--------------------------------------------------
 # Applying Brandless mode
 #--------------------------------------------------
 '
+
 #Watermark
-if [ ! -f "$WTM2_PATH" ]; then
-    cp images/watermark2.png "$WTM2_PATH"
-else
-    echo "watermark2 file exists, skipping copying..."
-fi
+copy_if_not_there "$WTM2_PATH"
+
+#Watermark svg
+copy_if_not_there "$WTM2_SVG_PATH"
+
 #Favicon
-if [ ! -f "$FICON_PATH" ]; then
-    cp images/favicon2.ico "$FICON_PATH"
-else
-    echo "favicon2 file exists, skipping copying..."
-fi
+copy_if_not_there "$FICON_PATH"
+
 #Local recording icon
-if [ ! -f "$REC_ICON_PATH" ];then
-    cp images/gnome_record.png "$REC_ICON_PATH"
-else
-    echo "recording icon exists, skipping copying..."
-fi
+copy_if_not_there "$REC_ICON_PATH"
 
 #Custom / Remove icons
 sed -i "s|watermark.png|watermark2.png|g" "$CSS_FILE"
@@ -70,6 +72,10 @@ sed -i "s|icon-cloud.png|gnome_record.png|g" "$BUNDLE_JS"
 if ! grep -q ".leftwatermark{display:none" "$CSS_FILE" ; then
     sed -i "s|.leftwatermark{|.leftwatermark{display:none;|" "$CSS_FILE"
 fi
+#Replace App logo
+sed -i "s|// defaultLogoUrl: .*|    defaultLogoUrl: 'images/watermark2.svg',|" "$MEET_CONF"
+#Overwrite favicon svg
+cp images/watermark2.svg $JM_IMG_PATH/favicon.svg
 
 #Customize room title
 sed -i "s|Jitsi Meet|$APP_NAME|g" "$TITLE_FILE"

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 +short myip.opendns.com @resolver1.opendns.com)"
+PUBLIC_IP="$(dig -4 +short myip.opendns.com @resolver1.opendns.com)"
 ISO3166_CODE=TBD
 NL="$(printf '\n  ')"
 

quick_jibri_installer.sh

@@ -567,18 +567,6 @@ do
   fi
 done
 sleep .1
-#Language
-echo "## Setting up Jitsi Meet language ##
-You can define the language, for a complete list of the supported languages
-
-See here:
-https://github.com/jitsi/jitsi-meet/blob/master/lang/languages.json"
-printf "Jitsi Meet web interface will be set to use such language.\n\n"
-sleep .1
-read -p "Please set your language (Press enter to default to 'en'):$NL" -r JB_LANG
-sleep .1
-printf "\nWe'll take a minute to localize some UI excerpts if you need.\n\n"
-sleep .1
 #Participant
 printf "> Do you want to translate 'Participant' to your own language?\n"
 sleep .1
@@ -876,18 +864,17 @@ sed -i "s|conference.$DOMAIN|internal.auth.$DOMAIN|" "$MEET_CONF"
 sed -i "s|// recordingService:|recordingService:|" "$MEET_CONF"
 sed -i "/recordingService/,/hideStorageWarning/s|//     enabled: false,|       enabled: true,|" "$MEET_CONF"
 sed -i "/hideStorageWarning: false/,/Local recording configuration/s|// },|},|" "$MEET_CONF"
-sed -i "s|// liveStreamingEnabled: false,|liveStreamingEnabled: true,\\
-\\
-    hiddenDomain: \'recorder.$DOMAIN\',|" "$MEET_CONF"
+sed -i "/fileRecordingsServiceEnabled: false,/a \\
+    hiddenDomain: \'recorder.$DOMAIN\'," "$MEET_CONF"
 
-#Setup main language
-if [ -z "$JB_LANG" ] || [ "$JB_LANG" = "en" ]; then
-    echo "Leaving English (en) as default language..."
-    sed -i "s|// defaultLanguage: 'en',|defaultLanguage: 'en',|" "$MEET_CONF"
-else
-    echo "Changing default language to: $JB_LANG"
-    sed -i "s|// defaultLanguage: 'en',|defaultLanguage: \'$JB_LANG\',|" "$MEET_CONF"
-fi
+##Setup main language
+#if [ -z "$JB_LANG" ] || [ "$JB_LANG" = "en" ]; then
+    #echo "Leaving English (en) as default language..."
+    #sed -i "s|// defaultLanguage: 'en',|defaultLanguage: 'en',|" "$MEET_CONF"
+#else
+    #echo "Changing default language to: $JB_LANG"
+    #sed -i "s|// defaultLanguage: 'en',|defaultLanguage: \'$JB_LANG\',|" "$MEET_CONF"
+#fi
 
 # Recording directory
 if [ ! -d "$DIR_RECORD" ]; then
@@ -1197,9 +1184,11 @@ sed -i "s|// startAudioMuted: 10,|startAudioMuted: 1,|" "$MEET_CONF"
 
 #Disable/enable welcome page
 if [ "$ENABLE_WELCP" = "yes" ]; then
-    sed -i "s|.*enableWelcomePage:.*|    enableWelcomePage: false,|" "$MEET_CONF"
+    sed -i "/ welcomePage: {/,/},/s|// ||" "$MEET_CONF"
+    sed -i "/ welcomePage: {/,/},/s|disabled: .*,|disabled: true,|" "$MEET_CONF"
 elif [ "$ENABLE_WELCP" = "no" ]; then
-    sed -i "s|.*enableWelcomePage:.*|    enableWelcomePage: true,|" "$MEET_CONF"
+    sed -i "/ welcomePage: {/,/},/s|// ||" "$MEET_CONF"
+    sed -i "/ welcomePage: {/,/},/s|disabled: .*,|disabled: false,|" "$MEET_CONF"
 fi
 #Enable close page
 if [ "$ENABLE_CLOCP" = "yes" ]; then