From df2191aae57988b89fe53ad29f62af65d4810e45 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 23 Oct 2020 12:12:18 +0200 Subject: [PATCH] Fixed more prosody config typo's --- JMS/conf.sh | 2 +- JMS/conf/prosody-Unconfigured | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/JMS/conf.sh b/JMS/conf.sh index d307959..e1c09f0 100644 --- a/JMS/conf.sh +++ b/JMS/conf.sh @@ -40,7 +40,7 @@ sslcer=$(sed -n ' s/certificate = \(.*\)/\1/p' /etc/prosody/conf.avail/$domain.c sslkey=$(sed -n ' s/key = \(.*\)/\1/p' /etc/prosody/conf.avail/$domain.cfg.lua | head -1| tr -d '"; ') mv /etc/prosody/conf.avail/$domain.cfg.lua /etc/prosody/conf.avail/$domain.cfg.lua.orig curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/conf/prosody-Unconfigured -o /etc/prosody/conf.avail/$domain.cfg.lua -sed -i -e 's/DOMAINname/'$domain'/g' -e 's#SSLKEY#'$sslcer'#g' -e 's#SSLKEY#'$sslkey'#g' -e 's/TURNSEC/'$turnsec'/g' -e 's/COMPSEC/'$compsec'/g' /etc/prosody/conf.avail/"$domain".cfg.lua +sed -i -e 's/DOMAINname/'$domain'/g' -e 's#SSLCERT#'$sslcer'#g' -e 's#SSLKEY#'$sslkey'#g' -e 's/TURNSEC/'$turnsec'/g' -e 's/COMPSEC/'$compsec'/g' /etc/prosody/conf.avail/"$domain".cfg.lua #webappli-config sed -i -e "/anonymousdomain:/c\anonymousdomain: 'guest.$domain'," -e '/startWithAudioMuted/c\startWithAudioMuted: true,' -e '/startWithVideoMuted/c\startWithVideoMuted: true,' -e '/fileRecordingsEnabled/c\fileRecordingsEnabled: false,' -e '/liveStreamingEnabled/c\liveStreamingEnabled: false,' -e "/^liveStreamingEnabled:.*/a\ hiddenDomain: 'recorder.$domain'," /etc/jitsi/meet/"$domain"-config.js diff --git a/JMS/conf/prosody-Unconfigured b/JMS/conf/prosody-Unconfigured index 911f236..4ab1847 100644 --- a/JMS/conf/prosody-Unconfigured +++ b/JMS/conf/prosody-Unconfigured @@ -26,6 +26,7 @@ VirtualHost "guest.DOMAINname" modules_enabled = { "muc_lobby_rooms"; "conference_duration"; + "turncredentials"; } lobby_muc = "lobby.DOMAINname" @@ -33,6 +34,7 @@ VirtualHost "guest.DOMAINname" muc_lobby_whitelist = { "recorder.DOMAINname" } VirtualHost "DOMAINname" + authentication = "internal_hashed" ssl = { key = "SSLKEY"; certificate = "SSLCERT"; @@ -74,8 +76,8 @@ Component "internal.auth.DOMAINname" "muc" VirtualHost "auth.DOMAINname" ssl = { - key = "SSLKEY"; - certificate = "SSLCERT"; + key = "auth.SSLKEY"; + certificate = "auth.SSLCERT"; } authentication = "internal_plain"