diff --git a/Install-JMS.sh b/Install-JMS.sh index 70214a9..9d72973 100644 --- a/Install-JMS.sh +++ b/Install-JMS.sh @@ -27,13 +27,13 @@ unset dist_ver dist #Repo Vars repo=https://git.ictmaatwerk.com/VPS-scripts/MeetServer -branch=main/JVB +branch=main/JMS branchtype=branch #SelfBuilding Vars mtype=""$repo"/raw/"$branchtype"/"$branch"" -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} +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) ##---------------## @@ -67,24 +67,23 @@ do jitsipack=sc genjvbsec=1 extcon=1 - ;; + break;; "Stand alone") jitsipack=sa extcon=1 - ;; + break;; "Full stand alone") jitsipack=sa extcon=0 - ;; + break;; "Quit") - break - ;; + exit;; *) echo "invalid option $REPLY";; esac done 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 [Yy]* ) lecert=1; break;; [Nn]* ) lecert=0; break;; @@ -152,7 +151,7 @@ fi mkdir -p /etc/ICTM/ echo "InstDate=$(date "+%d-%B-%Y")" >> /etc/ICTM/JitsiMeet.var 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 diff --git a/JMS/preconf.sh b/JMS/preconf.sh index 8c3a3d8..5e6bb01 100644 --- a/JMS/preconf.sh +++ b/JMS/preconf.sh @@ -11,7 +11,7 @@ debconf-set-selections <<< "jitsi-meet-web-config jitsi-meet/cert-choice select # Package list for Scalable 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" echo "jitsi-meet-web jitsi-meet-web-config jitsi-meet-prosody jicofo jitsi-meet-turnserver prosody" >> /tmp/pkg.list fi