From e1943bbf02114ded2b8ba1b01a3428af578ec8d0 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 23 Oct 2020 11:07:02 +0200
Subject: [PATCH] Fixed oopsie

---
 JIB/conf.sh | 2 +-
 JMS/conf.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/JIB/conf.sh b/JIB/conf.sh
index 4af6b90..80b57b9 100644
--- a/JIB/conf.sh
+++ b/JIB/conf.sh
@@ -29,7 +29,7 @@ mv /etc/resolve.conf /etc/resolve.conf.bck > $OUTPUT 2>&1
 echo "nameserver  $intip" > /etc/resolve.conf 
 
 #config jibri
-curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/config.json -o /etc/jitsi/jibri/config.json
+curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/conf/config.json -o /etc/jitsi/jibri/config.json
 sed -i  -e 's/DOMAINname/'$domain'/g' -e 's/JIBRIname/'$jibinstid'/g' -e 's/RECsecret/'$jibrsec'/g' -e 's/JIBRIsecret/'$jibsec'/g' /etc/jitsi/jibri/config.json
 usermod -aG adm,audio,video,plugdev jibri > $OUTPUT 2>&1
 mkdir /recordings > $OUTPUT 2>&1
diff --git a/JMS/conf.sh b/JMS/conf.sh
index 2422cdc..9d6d498 100644
--- a/JMS/conf.sh
+++ b/JMS/conf.sh
@@ -27,7 +27,7 @@ echo "y" | ufw enable > $OUTPUT 2>&1
 #config dnsmasq
 if [ "$extcon" = "1" ] ; then
     systemctl stop dnsmasq
-    curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/config/dnsmasq.conf -o /etc/dnsmasq.d/main.conf 
+    curl --retry 7 --retry-delay 5 -s "$mrepo"/raw/branch/"$mbranch"/conf/dnsmasq.conf -o /etc/dnsmasq.d/main.conf 
     sed -i  -e 's/DOMAINname/'$domain'/g' -e 's/HOSTname/'${domain%%.*}'/g' -e 's/INTif/'$innetworkif'/g'  -e 's/INTip/''/g'  /etc/dnsmasq.d/main.conf
 fi
 
@@ -39,7 +39,7 @@ turnsec=$(sed -n 's/turncredentials_secret = \(.*\)/\1/p' /etc/prosody/conf.avai
 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"/config/prosody-Unconfigured -o /etc/prosody/conf.avail/$domain.cfg.lua
+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
 
 #webappli-config