From 22c1b881ae0e975a9158dd326f4ce152667fcc8b Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Wed, 17 Jul 2024 02:14:37 +0000
Subject: [PATCH] v7.4.1 (#112)

* fix etherpad nginx configuration
* fix live streaming not enabled by default

Reviewed-on: https://forge.switnet.net/switnet/quick-jibri-installer/pulls/112
Co-authored-by: Ark74 <ark@switnet.org>
Co-committed-by: Ark74 <ark@switnet.org>
---
 etherpad-docker.sh       |  8 ++++++--
 quick_jibri_installer.sh | 13 ++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/etherpad-docker.sh b/etherpad-docker.sh
index a8ff023..81ab2c3 100644
--- a/etherpad-docker.sh
+++ b/etherpad-docker.sh
@@ -122,10 +122,14 @@ elif [ -f "$WS_CONF" ]; then
     echo "> Setting up webserver configuration file..."
     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_http_version 1.1;" "$WS_CONF"
+    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_set_header Upgrade \$http_upgrade;" "$WS_CONF"
+    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_set_header Connection \$connection_upgrade;" "$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_redirect off;" "$WS_CONF"
     sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_set_header       Host \$host;" "$WS_CONF"
+    sed -i "/$WS_CONF_MATCH1/i \ \ \ \ \ \ \ \ proxy_pass http:\/\/localhost:9001\/;" "$WS_CONF"
     sed -i "/$WS_CONF_MATCH1/i \ \ \ \ }" "$WS_CONF"
     sed -i "/$WS_CONF_MATCH1/i \\\n" "$WS_CONF"
 else
@@ -138,7 +142,7 @@ if [ "$(grep -c "etherpad_base" "$WS_CONF")" != 0 ]; then
     echo -e "> $MEET_CONF seems configured, skipping...\n"
 else
     echo -e "> Setting etherpad domain at $MEET_CONF...\n"
-    sed -i "/ openSharedDocumentOnJoin:/a\ \ \ \ etherpad_base: \'https://$DOMAIN/etherpad/p/\'," "$MEET_CONF"
+    sed -i "s|// etherpad_base: .*|etherpad_base: \'https://$DOMAIN/etherpad/p/\',|" "$MEET_CONF"
 fi
 
 echo "> Checking nginx configuration..."
diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh
index 12a63bd..3dd7bf9 100644
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@@ -861,13 +861,20 @@ BREWERY
 
 # Jibri tweaks for /etc/jitsi/meet/$DOMAIN-config.js
 sed -i "s|conference.$DOMAIN|internal.auth.$DOMAIN|" "$MEET_CONF"
-#New recording implementation.
+
+#Enable recording by default.
 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 "/recordingService/,/hideStorageWarning/s|//     enabled: false,|    enabled: true,|" "$MEET_CONF"
+sed -i "/hideStorageWarning: false/,/}/s|// },|},|" "$MEET_CONF"
 sed -i "/fileRecordingsServiceEnabled: false,/a \\
     hiddenDomain: \'recorder.$DOMAIN\'," "$MEET_CONF"
 
+#Enable livestreaming by default.
+sed -i "s|// liveStreaming:|liveStreaming:|" "$MEET_CONF"
+sed -i "/liveStreaming:/,/helpLink:/s|//     enabled: false,|    enabled: true,|" "$MEET_CONF"
+sed -i "s|//    helpLink:|   helpLink:|" "$MEET_CONF"
+sed -i "/helpLink:/,/}/s|// },|},|" "$MEET_CONF"
+
 # Recording directory
 if [ ! -d "$DIR_RECORD" ]; then
     mkdir "$DIR_RECORD"