From 33c8ebd3e395aa79bf5fd1975c64800fdda38c05 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 23 Oct 2020 13:25:35 +0200
Subject: [PATCH] Added fix to JIB installer

---
 Install-JIB.sh |  4 ++--
 Install-JVB.sh |  4 ++--
 JIB/conf.sh    | 13 ++++++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Install-JIB.sh b/Install-JIB.sh
index 03fe00f..c8b2b55 100644
--- a/Install-JIB.sh
+++ b/Install-JIB.sh
@@ -1,8 +1,8 @@
 #######################
 #   JitsiMeet - JIB   #
 #######################
-if [ ! -f "~/jistiMeet.var" ] ; then echo 'Please put "/etc/ICTM/JitsiMeet.var" from main server in "~/jistiMeet.var"' && exit ; fi
-source ~/jistiMeet.var
+if [ ! -f ~/JitsiMeet.var ] ; then echo 'Please put "/etc/ICTM/JitsiMeet.var" from main server in "~/JitsiMeet.var"' && exit ; fi
+source ~/JitsiMeet.var
 
 ##-----------------##
 #   Defining Vars   #
diff --git a/Install-JVB.sh b/Install-JVB.sh
index 8385b1c..2bc4d29 100644
--- a/Install-JVB.sh
+++ b/Install-JVB.sh
@@ -1,9 +1,9 @@
 #######################
 #   JitsiMeet - JVB   #
 #######################
-if [ ! -f "~/jistiMeet.var" ] ; then echo 'Please put "/etc/ICTM/JitsiMeet.var" from main server in "~/jistiMeet.var"' && exit ; fi
+if [ ! -f ~/JitsiMeet.var ] ; then echo 'Please put "/etc/ICTM/JitsiMeet.var" from main server in "~/JitsiMeet.var"' && exit ; fi
 
-source ~/jistiMeet.var
+source ~/JitsiMeet.var
 
 ##-----------------##
 #   Defining Vars   #
diff --git a/JIB/conf.sh b/JIB/conf.sh
index 80b57b9..30eb7b9 100644
--- a/JIB/conf.sh
+++ b/JIB/conf.sh
@@ -13,8 +13,8 @@ echo "y" | ufw enable > $OUTPUT 2>&1
 #install ChromeDriver
 curl --retry 7 --retry-delay 5 -s http://chromedriver.storage.googleapis.com/"$(curl -sS chromedriver.storage.googleapis.com/LATEST_RELEASE)"/chromedriver_linux64.zip  -o /tmp/chromedriver.zip
 unzip /tmp/chromedriver.zip -d /tmp > $OUTPUT 2>&1
-sudo mv -f /tmp/chromedriver /usr/local/bin/chromedriver > $OUTPUT 2>&1
-sudo chmod 0755 /usr/local/bin/chromedriver > $OUTPUT 2>&1
+mv -f /tmp/chromedriver /usr/local/bin/chromedriver > $OUTPUT 2>&1
+chmod 0755 /usr/local/bin/chromedriver > $OUTPUT 2>&1
 
 #config chrome
 mkdir -p /etc/opt/chrome/policies/managed > $OUTPUT 2>&1
@@ -25,14 +25,17 @@ echo "snd_aloop" >> /etc/modules > $OUTPUT 2>&1
 modprobe snd_aloop > $OUTPUT 2>&1
 
 ##config dns
-mv /etc/resolve.conf /etc/resolve.conf.bck > $OUTPUT 2>&1
-echo "nameserver  $intip" > /etc/resolve.conf 
+mv resolv.conf resolv.conf.bck > $OUTPUT 2>&1
+echo "nameserver  $intip" > resolv.conf 
 
 #config jibri
+systemctl stop jibri
 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
 chown jibri:jibri /recordings > $OUTPUT 2>&1
-
 sed -i "s=exec java=exec /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin/java=g" /opt/jitsi/jibri/launch.sh
+systemctl enable jibri > $OUTPUT 2>&1
+systemctl start jibri > $OUTPUT 2>&1
+