From 0e3922c89ea964d56fbed52999671a65d84967a4 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Thu, 6 May 2021 01:08:25 -0500
Subject: [PATCH] Improve cleaning on star-over

---
 quick_jibri_installer.sh | 16 ++++++++--------
 tools/start-over.sh      | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh
index 182f0e7..28b27e0 100644
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@@ -661,14 +661,14 @@ WAN_IP=$(dig +short myip.opendns.com @resolver1.opendns.com)
 
 ssl_wa() {
 if [ "$LE_SSL" = "yes" ]; then
-systemctl stop $1
-    letsencrypt certonly --standalone --renew-by-default --agree-tos --email $5 -d $6
-    sed -i "s|/etc/jitsi/meet/$3.crt|/etc/letsencrypt/live/$3/fullchain.pem|" $4
-    sed -i "s|/etc/jitsi/meet/$3.key|/etc/letsencrypt/live/$3/privkey.pem|" $4
-systemctl restart $1
-    #Add cron
-    crontab -l | { cat; echo "@weekly certbot renew --${2} > $LE_RENEW_LOG 2>&1"; } | crontab -
-    crontab -l
+  systemctl stop $1
+  letsencrypt certonly --standalone --renew-by-default --agree-tos --email $5 -d $6
+  sed -i "s|/etc/jitsi/meet/$3.crt|/etc/letsencrypt/live/$3/fullchain.pem|" $4
+  sed -i "s|/etc/jitsi/meet/$3.key|/etc/letsencrypt/live/$3/privkey.pem|" $4
+  systemctl restart $1
+  #Add cron
+  crontab -l | { cat; echo "@weekly certbot renew --${2} > $LE_RENEW_LOG 2>&1"; } | crontab -
+  crontab -l
 fi
 }
 
diff --git a/tools/start-over.sh b/tools/start-over.sh
index 58c23e0..d784006 100644
--- a/tools/start-over.sh
+++ b/tools/start-over.sh
@@ -31,9 +31,26 @@ while [ $secs -gt 0 ]; do
    : $((secs--))
 done
 }
+remove_residuals() {
+  if [ -d $1 ]; then
+    rm -r $1
+  fi
+}
 purge_debconf() {
   echo PURGE | debconf-communicate $1
 }
+remove_services() {
+  systemctl disable $1
+  systemctl stop $1
+}
+echo -e '
+########################################################################
+                Welcome to the Start Over cleaner script
+########################################################################
+                    by Software, IT & Networks Ltd
+\n'
+
+SYNC_USER="$(ls /home|awk '/jbsync/{print}')"
 
 echo "We are about to remove and clean all the jitsi-meet plaform bits and pieces...
 Please make sure you have backed up anything you don't want to loose."
@@ -62,7 +79,7 @@ if [ "$CONTINUE_PURGE2" = "no" ]; then
     exit
 elif [ "$CONTINUE_PURGE2" = "yes" ]; then
     echo "No going back, lets start..."
-    wait_seconds 3
+    wait_seconds 5
 fi
 done
 
@@ -78,15 +95,18 @@ apt-get -y purge jibri \
                  jitsi-videobridge2 \
                  prosody
 
+#Services stop
+remove_services jibri*
+
 #Cleaning packages
 apt-get -y autoremove
 apt-get clean
 
 #Removing residual files
-rm -r /etc/jitsi
-rm -r /opt/jitsi
-rm -r /usr/share/jicofo
-rm -r /usr/share/jitsi-*
+remove_residuals /etc/jitsi
+remove_residuals /opt/jitsi
+remove_residuals /usr/share/jicofo
+remove_residuals /usr/share/jitsi-*
 
 #Purging debconf db
 purge_debconf jicofo
@@ -97,4 +117,12 @@ purge_debconf jitsi-meet-turnserver
 purge_debconf jitsi-meet-web-config
 purge_debconf jitsi-videobridge2
 
+#Remove unused users
+if [ ! -z $SYNC_USER ]; then
+  deluser --remove-home $SYNC_USER
+fi
+if [ -d /home/jibri ]; then
+  deluser --remove-home  jibri
+fi
+
 echo "We are done..."