From db205519e76037774c381e03d7b761cf5b2d7fd2 Mon Sep 17 00:00:00 2001
From: Geoffrey Kwan <geoffreykwan@gmail.com>
Date: Wed, 6 Apr 2022 14:26:49 -0700
Subject: [PATCH] build(Server Install): Run tomcat service as tomcat user

---
 scripts/beforeInstall.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/beforeInstall.sh b/scripts/beforeInstall.sh
index 31bfbb8cb..38b1c94a2 100644
--- a/scripts/beforeInstall.sh
+++ b/scripts/beforeInstall.sh
@@ -49,10 +49,6 @@ apt-get install tomcat9 -y
 echo "Removing Tomcat ROOT folder"
 rm -rf $CATALINA_HOME/webapps/ROOT
 
-echo 'Setting Tomcat to run as ubuntu user'
-sed 's/User=tomcat/User=ubuntu/' -i /lib/systemd/system/tomcat9.service
-systemctl daemon-reload
-
 echo "Add https to Tomcat server.xml"
 sed 's/<Connector port="8080"/<Connector port="8080" scheme="https"/' -i $CATALINA_HOME/conf/server.xml
 
@@ -63,8 +59,8 @@ echo "Restarting Tomcat"
 service tomcat9 restart
 
 echo "Creating Tomcat curriculum and studentuploads folders"
-sudo -u ubuntu -g tomcat mkdir $CATALINA_HOME/webapps/curriculum
-sudo -u ubuntu -g tomcat mkdir $CATALINA_HOME/webapps/studentuploads
+sudo -u tomcat -g tomcat mkdir $CATALINA_HOME/webapps/curriculum
+sudo -u tomcat -g tomcat mkdir $CATALINA_HOME/webapps/studentuploads
 
 echo "Installing Nginx"
 apt-get install nginx -y