From 30c6a2a5927639bc19f925138a37b53cba16a010 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 23 Oct 2020 12:27:08 +0200
Subject: [PATCH] More prosody config changes (SSL)

---
 JMS/conf.sh                   | 7 +++----
 JMS/conf/prosody-Unconfigured | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/JMS/conf.sh b/JMS/conf.sh
index e1c09f0..701ce5f 100644
--- a/JMS/conf.sh
+++ b/JMS/conf.sh
@@ -36,11 +36,9 @@ fi
 systemctl stop prosody jicofo
 compsec=$(sed -n 's/component_secret = \(.*\)/\1/p' /etc/prosody/conf.avail/$domain.cfg.lua| head -1| tr -d '"; ')
 turnsec=$(sed -n 's/turncredentials_secret = \(.*\)/\1/p' /etc/prosody/conf.avail/$domain.cfg.lua | head -1| tr -d '"; ')
-sslcer=$(sed -n ' s/certificate = \(.*\)/\1/p' /etc/prosody/conf.avail/$domain.cfg.lua | head -1| tr -d '"; ')
-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#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
+sed -i  -e 's/DOMAINname/'$domain'/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
@@ -57,7 +55,8 @@ echo 'sed -i -e '/fileRecordingsEnabled/c\fileRecordingsEnabled: false,' /etc/ji
 fi
 
 #start services
-systemctl enable --now prosody jicofo dnsmasq
+systemctl enable prosody jicofo dnsmasq
+systemctl start prosody jicofo dnsmasq
 
 #Create users
 prosodyctl register jibri auth.$domain $jibsec
diff --git a/JMS/conf/prosody-Unconfigured b/JMS/conf/prosody-Unconfigured
index 4ab1847..effeaa6 100644
--- a/JMS/conf/prosody-Unconfigured
+++ b/JMS/conf/prosody-Unconfigured
@@ -36,8 +36,8 @@ VirtualHost "guest.DOMAINname"
 VirtualHost "DOMAINname"
         authentication = "internal_hashed"
         ssl = {
-                key = "SSLKEY";
-                certificate = "SSLCERT";
+                key = "/etc/prosody/certs/DOMAINname.key";
+                certificate = "/etc/prosody/certs/DOMAINname.crt";
         }
         speakerstats_component = "speakerstats.DOMAINname"
         conference_duration_component = "conferenceduration.DOMAINname"
@@ -76,8 +76,8 @@ Component "internal.auth.DOMAINname" "muc"
 
 VirtualHost "auth.DOMAINname"
     ssl = {
-        key = "auth.SSLKEY";
-        certificate = "auth.SSLCERT";
+        key = "/etc/prosody/certs/auth.DOMAINname.key";
+        certificate = "/etc/prosody/certs/auth.DOMAINname.crt";
     }
     authentication = "internal_plain"