From c84f32ad640f68fb1e6f935a7e7f65a6867f250c Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Fri, 6 Nov 2015 20:46:41 +0000
Subject: [PATCH] deployment changes to take into account new properties
related to web service
---
sbin/dm_deploy_web_portal.sh | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/sbin/dm_deploy_web_portal.sh b/sbin/dm_deploy_web_portal.sh
index ae3d8739..782b94f7 100755
--- a/sbin/dm_deploy_web_portal.sh
+++ b/sbin/dm_deploy_web_portal.sh
@@ -37,14 +37,20 @@ else
echo "Deployment config file $deployConfigFile not found, using defaults"
fi
+JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
+DM_HOSTNAME=`hostname -f`
DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
DM_DEPLOY_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/autodeploy
DM_DIST_DIR=$DM_ROOT_DIR/src/java/DmWebPortal/dist
DM_BUILD_WAR_FILE=DmWebPortal.war
DM_WAR_FILE=$DM_CONTEXT_ROOT.war
-JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
+DM_SYSTEM_PASSWORD_FILE=${DM_INSTALL_DIR}/etc/${DM_SYSTEM_USER}.system.passwd
+
+cmd="echo $DM_DS_WEB_SERVICE_HOST | sed 's?DM_HOSTNAME?$DM_HOSTNAME?'"
+DM_DS_WEB_SERVICE_HOST=`eval $cmd`
+
if [ ! -f $DM_DIST_DIR/$DM_BUILD_WAR_FILE ]; then
echo "$DM_BUILD_WAR_FILE not found in $DM_DIST_DIR."
@@ -72,6 +78,14 @@ configFile=WEB-INF/classes/dm.portal.properties
cmd="cat $configFile | sed 's?dm.dsWebService.url=.*?dm.dsWebService.url=https://${DM_DS_WEB_SERVICE_HOST}:${DM_DS_WEB_SERVICE_PORT}/dm?g' > $configFile.2 && mv $configFile.2 $configFile"
eval $cmd
+configFile=WEB-INF/classes/dm.portal.properties
+cmd="cat $configFile | sed 's?dm.system.user=.*?dm.system.user=${DM_SYSTEM_USER}?g' > $configFile.2 && mv $configFile.2 $configFile"
+eval $cmd
+
+configFile=WEB-INF/classes/dm.portal.properties
+cmd="cat $configFile | sed 's?dm.system.passwordFile=.*?dm.system.passwordFile=${DM_SYSTEM_PASSWORD_FILE}?g' > $configFile.2 && mv $configFile.2 $configFile"
+eval $cmd
+
configFile=WEB-INF/classes/resources.properties
cmd="cat $configFile | sed 's?DmSoftwareVersion=.*?DmSoftwareVersion=${DM_SOFTWARE_VERSION}?g' | sed 's?DM_DATE?$DM_DATE?g' > $configFile.2 && mv $configFile.2 $configFile"
eval $cmd
--
GitLab