Skip to content

Commit 0ef6855

Browse files
committed
switch from mikefarah yq to kislyuk yq (default in ubuntu 24)
1 parent 454da09 commit 0ef6855

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

bbb-install.sh

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,7 @@ main() {
286286
if [ "$DISTRO" == "noble" ]; then
287287
need_pkg ca-certificates
288288

289-
YQ_VERSION="v4.16.2" # TODO - push the assets from the original repo/release into our fork so we can wget from bbb/yq
290-
YQ_BINARY="yq_linux_amd64"
291-
sudo wget -O /usr/local/bin/yq \
292-
"https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY}"
293-
sudo chmod +x /usr/local/bin/yq
294-
say "--------------------------------------"
289+
need_pkg yq
295290
yq --version
296291

297292
#need_ppa libreoffice-ubuntu-ppa-noble.list ppa:libreoffice/ppa 1378B444 # Latest version of libreoffice
@@ -1767,7 +1762,8 @@ fi
17671762
sed -i "s/proxy_pass .*/proxy_pass https:\/\/$IP:7443;/g" /usr/share/bigbluebutton/nginx/sip.nginx
17681763
else
17691764
# Use nginx as proxy for WSS -> WS (see https://github.com/bigbluebutton/bigbluebutton/issues/9667)
1770-
yq e -i '.public.media.sipjsHackViaWs = true' /etc/bigbluebutton/bbb-html5.yml
1765+
touch /etc/bigbluebutton/bbb-html5.yml
1766+
yq -y -i '.public.media.sipjsHackViaWs = true' /etc/bigbluebutton/bbb-html5.yml
17711767
sed -i "s/proxy_pass .*/proxy_pass http:\/\/$IP:5066;/g" /usr/share/bigbluebutton/nginx/sip.nginx
17721768
xmlstarlet edit --inplace --update '//param[@name="ws-binding"]/@value' --value "$IP:5066" /opt/freeswitch/conf/sip_profiles/external.xml
17731769
fi
@@ -1777,7 +1773,7 @@ fi
17771773
sed -i 's/^bigbluebutton.web.serverURL=http:/bigbluebutton.web.serverURL=https:/g' "$BBB_WEB_ETC_CONFIG"
17781774
fi
17791775

1780-
yq e -i '.playback_protocol = "https"' /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml
1776+
yq -y -i '.playback_protocol = "https"' /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml
17811777
chmod 644 /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml
17821778

17831779
# Update Greenlight (if installed) to use SSL
@@ -1799,29 +1795,29 @@ fi
17991795
TARGET=/etc/bigbluebutton/bbb-webrtc-sfu/production.yml
18001796
touch $TARGET
18011797

1802-
yq e -i ".freeswitch.ip = \"$IP\"" $TARGET
1798+
yq -y -i ".freeswitch.ip = \"$IP\"" $TARGET
18031799

18041800
if [[ $BIGBLUEBUTTON_RELEASE == 2.2.* ]] && [[ ${BIGBLUEBUTTON_RELEASE#*.*.} -lt 29 ]]; then
18051801
if [ -n "$INTERNAL_IP" ]; then
1806-
yq e -i ".freeswitch.sip_ip = \"$INTERNAL_IP\"" $TARGET
1802+
yq -y -i ".freeswitch.sip_ip = \"$INTERNAL_IP\"" $TARGET
18071803
else
1808-
yq e -i ".freeswitch.sip_ip = \"$IP\"" $TARGET
1804+
yq -y -i ".freeswitch.sip_ip = \"$IP\"" $TARGET
18091805
fi
18101806
else
18111807
# Use nginx as proxy for WSS -> WS (see https://github.com/bigbluebutton/bigbluebutton/issues/9667)
1812-
yq e -i ".freeswitch.sip_ip = \"$IP\"" $TARGET
1808+
yq -y -i ".freeswitch.sip_ip = \"$IP\"" $TARGET
18131809
fi
18141810
chown bigbluebutton:bigbluebutton $TARGET
18151811
chmod 644 $TARGET
18161812

18171813
# Configure mediasoup IPs, reference: https://raw.githubusercontent.com/bigbluebutton/bbb-webrtc-sfu/v2.7.2/docs/mediasoup.md
18181814
# mediasoup IPs: WebRTC
1819-
yq e -i '.mediasoup.webrtc.listenIps[0].ip = "0.0.0.0"' $TARGET
1820-
yq e -i ".mediasoup.webrtc.listenIps[0].announcedIp = \"$IP\"" $TARGET
1815+
yq -y -i '.mediasoup.webrtc.listenIps[0].ip = "0.0.0.0"' $TARGET
1816+
yq -y -i ".mediasoup.webrtc.listenIps[0].announcedIp = \"$IP\"" $TARGET
18211817

18221818
# mediasoup IPs: plain RTP (internal comms, FS <-> mediasoup)
1823-
yq e -i '.mediasoup.plainRtp.listenIp.ip = "0.0.0.0"' $TARGET
1824-
yq e -i ".mediasoup.plainRtp.listenIp.announcedIp = \"$IP\"" $TARGET
1819+
yq -y -i '.mediasoup.plainRtp.listenIp.ip = "0.0.0.0"' $TARGET
1820+
yq -y -i ".mediasoup.plainRtp.listenIp.announcedIp = \"$IP\"" $TARGET
18251821

18261822
systemctl reload nginx
18271823
}

0 commit comments

Comments
 (0)