From e7357c1788f5331149a6f61b0dcf67fb5b6e0d68 Mon Sep 17 00:00:00 2001
From: root <root@mailtrain.mt>
Date: Tue, 25 Dec 2018 11:11:01 +0100
Subject: [PATCH] Updates to install scripts

---
 setup/functions                | 30 +++++++++++++++++-------------
 setup/install-centos7-https.sh |  4 +++-
 setup/install-centos7-local.sh |  4 +++-
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/setup/functions b/setup/functions
index 34cff870..8d390c11 100644
--- a/setup/functions
+++ b/setup/functions
@@ -4,14 +4,9 @@ if hash firewall-cmd 2>/dev/null; then
     firewallCmdExists=yes
 fi
 
-function installBase {
-    local urlBaseTrusted="$1"
-    local urlBaseSandbox="$2"
-    local urlBasePublic="$3"
-    local wwwHost="$4"
-    
+function installPrerequisities {
     yum -y install epel-release
-    
+
     curl --silent --location https://rpm.nodesource.com/setup_10.x | bash -
     cat > /etc/yum.repos.d/mongodb-org.repo <<EOT
 [mongodb-org-4.0]
@@ -21,19 +16,26 @@ gpgcheck=1
 enabled=1
 gpgkey=https://www.mongodb.org/static/pgp/server-4.0.asc
 EOT
-    
+
     yum -y install mariadb-server nodejs ImageMagick git python redis pwgen bind-utils gcc-c++ make mongodb-org bzip2
-    
+
     systemctl start mariadb
     systemctl enable mariadb
-    
+
     systemctl start redis
     systemctl enable redis
-    
+
     systemctl start mongod
     systemctl enable mongod
-    
-    
+}
+
+
+function installMailtrain {
+    local urlBaseTrusted="$1"
+    local urlBaseSandbox="$2"
+    local urlBasePublic="$3"
+    local wwwHost="$4"
+
     mysqlPassword=`pwgen 12 -1`
     mysqlRoPassword=`pwgen 12 -1`
     
@@ -259,6 +261,8 @@ EOT
 
 
 function createCertificates {
+    # This assumes that HTTPD is not yet running
+    
     local hostTrusted="$1"
     local hostSandbox="$2"
     local hostPublic="$3"
diff --git a/setup/install-centos7-https.sh b/setup/install-centos7-https.sh
index d1494204..7ad73370 100644
--- a/setup/install-centos7-https.sh
+++ b/setup/install-centos7-https.sh
@@ -43,10 +43,12 @@ hostSandbox="$2"
 hostPublic="$3"
 email="$4"
 
+installPrerequisities
+
 createCertificates "${hostTrusted}" "${hostSandbox}" "${hostPublic}" "${email}"
 
 installHttps "${hostTrusted}" 443 "${hostSandbox}" 443 "${hostPublic}" 443 "/etc/letsencrypt/live/${hostPublic}/cert.pem" "/etc/letsencrypt/live/${hostPublic}/privkey.pem" "/etc/letsencrypt/live/${hostPublic}/chain.pem" 
 
-installBase "https://${hostTrusted}" "https://${hostSandbox}" "https://${hostPublic}" 127.0.0.1
+installMailtrain "https://${hostTrusted}" "https://${hostSandbox}" "https://${hostPublic}" 127.0.0.1
 
 installService
diff --git a/setup/install-centos7-local.sh b/setup/install-centos7-local.sh
index b6759046..6e616ae6 100644
--- a/setup/install-centos7-local.sh
+++ b/setup/install-centos7-local.sh
@@ -36,6 +36,8 @@ if [ $# -lt 0 ]; then
         HELP
 fi
 
-installBase http://localhost:3000 http://localhost:3003 http://localhost:3004 0.0.0.0
+installPrerequisities
+
+installMailtrain http://localhost:3000 http://localhost:3003 http://localhost:3004 0.0.0.0
 
 installService