From d3a82a322efa62478f550312d17a81eedaad8b3a Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 29 Oct 2019 14:31:42 +0000
Subject: [PATCH] First beta version

---
 vips-backend-single-server.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vips-backend-single-server.sh b/vips-backend-single-server.sh
index c8f5152..4e416ba 100755
--- a/vips-backend-single-server.sh
+++ b/vips-backend-single-server.sh
@@ -98,7 +98,6 @@ WILDFLY_HOME=/home/$CODE_USER/wildfly-$WILDFLY_VERSION
 WILDFLY_CONFIG_PATH=$WILDFLY_HOME/standalone/configuration
 
 cd $INITIAL_DIRECTORY/wildfly_config
-sudo -H -u $CODE_USER bash -c "python3 init_standalone_xml.py --smtpserver $smtpserver --md5salt $md5salt --dbpassword $vipslogic_password --path $WILDFLY_CONFIG_PATH"
 
 # Add the required modules for VIPSLogic to Wildfly
 # PostgreSQL
@@ -145,8 +144,12 @@ do
         read -sp "Password for vipslogic [*]: " vipslogic_password
 done
 
+cd $INITIAL_DIRECTORY
 sudo -H -u postgres bash -c "psql -v vipslogic_password=\"'$vipslogic_password'\" -f db/vipslogic_init_1.sql"
 
+# Add the info to the wildfly configuration file
+cd $INITIAL_DIRECTORY/wildfly_config
+sudo -H -u $CODE_USER bash -c "python3 init_standalone_xml.py --smtpserver $smtpserver --md5salt $md5salt --dbpassword $vipslogic_password --path $WILDFLY_CONFIG_PATH"
 
 
 # Run and test WildFly with VIPSLogic deployed
-- 
GitLab