Update README.md, ubuntu_hermes_install.sh, hermes_migrate_1804_2004.sh

README.md

@@ -60,7 +60,7 @@ It can be deployed to protect your in-house email solution as well as cloud emai
 ![Screenshot](2021_12_02_19_48_49.png)
 ## Installation
 
-Hermes SEG can be easily installed in your existing **Ubuntu 18.04 LTS** or **Ubuntu 20.04 LTS** server machine by utilizing the **ubuntu_hermes_install.sh** script. The script requires that you have a fully updated Ubuntu server installation and that you have a /mnt/data directory for database and email archive storage. **You must have at least 8 GB of RAM and 4 CPUs**.
+Hermes SEG can be easily installed in your existing **Ubuntu 20.04 LTS Server** machine by utilizing the **ubuntu_hermes_install.sh** script. The script requires that you have a fully updated Ubuntu installation and that you have a /mnt/data directory for database and email archive storage. **You must have at least 8 GB of RAM and 4 CPUs**.
 
 **Required Information**
 

hermes_migrate_1804_2004.sh

@@ -24,6 +24,10 @@ TIMESTAMP=`date +%m-%d-%Y-%H%M`
 TOMCATVERSION="tomcat9"
 TOMCATUSER="tomcat"
 
+THEVERSION="20.04"
+HERMES_SQL_USERNAME=`cat /opt/hermes/creds/hermes_username`
+HERMES_SQL_PASSWORD=`cat /opt/hermes/creds/hermes_password`
+
 
 echo "Installing Boxes Prerequisite if necessary"
 #Install boxes
@@ -51,6 +55,14 @@ else
 echo "${GREEN}Completed Installing Spinner Prerequisite ${RESET}"
 fi
 
+source "$(pwd)/spinner.sh"
+
+# test success
+start_spinner 'sleeping for 2 secs...'
+sleep 2
+stop_spinner $?
+
+
 PS3='This script will attempt to install various packages and migrate various settings for a Hermes SEG installation that was successfully upgraded from Ubuntu 18.04 to Ubuntu 20.04 using the do-release-upgrade command. Ensure that you have a fresh and valid backup of your machine before proceeding. This script is offered with absolutely no warrranty or guarantee of any kind. We cannot be held liable for any damage that may occur to your system. Do you agree with the terms of this script?: '
 
 options=("Yes - I agree" "No - I do not agree")
@@ -108,7 +120,16 @@ sleep 1
 
 #Delete Tomcat8
 rm -rf /etc/tomcat8 >> $SCRIPTPATH/migrate_log-$TIMESTAMP.log 2>&1  && \
-rm -rf /etc/default/tomcat8 >> $SCRIPTPATH/migrate_log-$TIMESTAMP.log 2>&1
+rm -rf /etc/default/tomcat8.ORIGINAL >> $SCRIPTPATH/migrate_log-$TIMESTAMP.log 2>&1
+
+stop_spinner $?
+
+start_spinner 'Updating Hermes SEG Version...'
+sleep 1
+
+#UPDATE VERSION
+echo "[`date +%m/%d/%Y-%H:%M`] Updating Hermes SEG Version" >> $SCRIPTPATH/migrate_log-$TIMESTAMP.log 2>&1
+mysql -h localhost -u $HERMES_SQL_USERNAME -p$HERMES_SQL_PASSWORD -e "use hermes; update system_settings set value = '$THEVERSION' where parameter = 'version_no'" 
 
 stop_spinner $?
 

ubuntu_hermes_install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#The script below assumes you have a fully installed and updated Ubuntu 18.04 LTS/20.04 LTS (Recommended) server and you have created /mnt/data as outlined below. 
+#The script below assumes you have a fully installed and updated Ubuntu 20.04 LTS server and you have created /mnt/data as outlined below. 
 #The Configure /mnt/data partition directions below assumes you have a 250GB secondary drive which you will partition, format and mount as /mnt/data. Technically a secondary drive for the /mnt/data directory is not a requirement but it's highly recommended for performance reasons. If you don't wish to use a secondary drive for the /mnt/data directory, simply create a /mnt/data directory in your system and run this script.
 
 #Configure /mnt/data partition
@@ -69,6 +69,13 @@ if [ ! -d "/mnt/data" ]; then
 #      exit 1
 #   fi
 
+#Ensure Ubuntu 20.04
+string=`lsb_release -d`
+if [[ $string == *"Ubuntu 18.04"* ]]; then
+      echo "You must be running Ubuntu 20.04 LTS before attempting to install Hermes SEG, Exiting..."
+      exit 1
+fi
+
 #Set the script path
 SCRIPTPATH=$(pwd)
 
@@ -86,15 +93,9 @@ RED=`tput setaf 1`
 GREEN=`tput setaf 2`
 RESET=`tput sgr0`
 
-#Set Tomcat Parameters for Ubuntu Version
-string=`lsb_release -d`
-if [[ $string == *"Ubuntu 18.04"* ]]; then
-  TOMCATVERSION="tomcat8"
-  TOMCATUSER="tomcat8"
-elif [[ $string == *"Ubuntu 20.04"* ]]; then
-  TOMCATVERSION="tomcat9"
-  TOMCATUSER="tomcat"
-fi
+#Set Tomcat Version
+TOMCATVERSION="tomcat9"
+TOMCATUSER="tomcat"
 
 
 #Script Debug Set Variables. Do not enable unless you are troubleshooting