Fixed JMS Menu

This commit is contained in:
2020-10-23 10:27:49 +02:00
parent f1e16521d8
commit baf13c049c
2 changed files with 10 additions and 11 deletions

View File

@@ -27,13 +27,13 @@ unset dist_ver dist
#Repo Vars #Repo Vars
repo=https://git.ictmaatwerk.com/VPS-scripts/MeetServer repo=https://git.ictmaatwerk.com/VPS-scripts/MeetServer
branch=main/JVB branch=main/JMS
branchtype=branch branchtype=branch
#SelfBuilding Vars #SelfBuilding Vars
mtype=""$repo"/raw/"$branchtype"/"$branch"" mtype=""$repo"/raw/"$branchtype"/"$branch""
jibsec=${cat /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c 16} jibsec=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c 16)
jibrsec=${cat /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c 16} jibrsec=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c 16)
##---------------## ##---------------##
@@ -67,24 +67,23 @@ do
jitsipack=sc jitsipack=sc
genjvbsec=1 genjvbsec=1
extcon=1 extcon=1
;; break;;
"Stand alone") "Stand alone")
jitsipack=sa jitsipack=sa
extcon=1 extcon=1
;; break;;
"Full stand alone") "Full stand alone")
jitsipack=sa jitsipack=sa
extcon=0 extcon=0
;; break;;
"Quit") "Quit")
break exit;;
;;
*) echo "invalid option $REPLY";; *) echo "invalid option $REPLY";;
esac esac
done done
while true; do while true; do
read -p "Do you wish to install this program?" yn read -p "Use LetsEncrypt for ssl? (y/n)" yn
case $yn in case $yn in
[Yy]* ) lecert=1; break;; [Yy]* ) lecert=1; break;;
[Nn]* ) lecert=0; break;; [Nn]* ) lecert=0; break;;
@@ -152,7 +151,7 @@ fi
mkdir -p /etc/ICTM/ mkdir -p /etc/ICTM/
echo "InstDate=$(date "+%d-%B-%Y")" >> /etc/ICTM/JitsiMeet.var echo "InstDate=$(date "+%d-%B-%Y")" >> /etc/ICTM/JitsiMeet.var
for storeme in domain intip jvbsec jibsec jibrsec; do for storeme in domain intip jvbsec jibsec jibrsec; do
declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/mainvar.list declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/JitsiMeet.var
done done

View File

@@ -11,7 +11,7 @@ debconf-set-selections <<< "jitsi-meet-web-config jitsi-meet/cert-choice select
# Package list for Scalable # Package list for Scalable
if [ "$jitsipack" = "sc" ] ; then if [ "$jitsipack" = "sc" ] ; then
jvbsec=${cat /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c 16} jvbsec=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c 16)
debconf-set-selections <<< "jitsi-meet-prosody jitsi-videobridge/jvbsecret password $jvbsec" debconf-set-selections <<< "jitsi-meet-prosody jitsi-videobridge/jvbsecret password $jvbsec"
echo "jitsi-meet-web jitsi-meet-web-config jitsi-meet-prosody jicofo jitsi-meet-turnserver prosody" >> /tmp/pkg.list echo "jitsi-meet-web jitsi-meet-web-config jitsi-meet-prosody jicofo jitsi-meet-turnserver prosody" >> /tmp/pkg.list
fi fi