From 8e3f128075571ee9a099fcb3c82b3df91b6942f7 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Wed, 4 Nov 2020 15:18:37 +0100
Subject: [PATCH] add JMS support for Ubuntu 18.04, add prosody repo

---
 Install-JMS.sh       | 5 +++++
 JMS/conf.sh          | 1 +
 JMS/generic.pkg.list | 2 +-
 JMS/preconf.sh       | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Install-JMS.sh b/Install-JMS.sh
index 9d72973..bea2020 100644
--- a/Install-JMS.sh
+++ b/Install-JMS.sh
@@ -18,6 +18,11 @@ if [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
  PKGI="${PKGM} install -y --no-install-recommends"
  PKGLIST="apt"
  shortdist=deb10
+elif [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"18.04"* ]]; then
+ PKGM="$APTMODE"
+ PKGI="${PKGM} install -y --no-install-recommends"
+ PKGLIST="apt"
+ shortdist=ubu1804
 else
  echo "This os in not supported"
  exit
diff --git a/JMS/conf.sh b/JMS/conf.sh
index ef4ff1c..f8a0d25 100644
--- a/JMS/conf.sh
+++ b/JMS/conf.sh
@@ -58,6 +58,7 @@ fi
 #start services
 systemctl enable prosody jicofo dnsmasq
 systemctl start prosody jicofo dnsmasq
+systemctl restart nginx 
 
 #Create users
 prosodyctl register jibri auth.$domain $jibsec
diff --git a/JMS/generic.pkg.list b/JMS/generic.pkg.list
index 45f1309..12ecc18 100644
--- a/JMS/generic.pkg.list
+++ b/JMS/generic.pkg.list
@@ -1 +1 @@
-ufw
\ No newline at end of file
+ufw lua-sec
\ No newline at end of file
diff --git a/JMS/preconf.sh b/JMS/preconf.sh
index ac6ee67..480cdd6 100644
--- a/JMS/preconf.sh
+++ b/JMS/preconf.sh
@@ -4,6 +4,7 @@ mbranch=main/JMS
 
 #setup repo
 curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=jitsi osrel=$shortdist bash > $OUTPUT 2>&1
+curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=prosody osrel=$shortdist bash > $OUTPUT 2>&1
 
 #preconf jitsi
 debconf-set-selections <<< "jitsi-videobridge2 jitsi-videobridge/jvb-hostname string $domain"