Skip to content
Snippets Groups Projects
Commit 64677b09 authored by hammonds's avatar hammonds
Browse files

Changes to allow changing the domain name using DM_DOMAIN_NAME

Change method of deployment.
It was copying the files into the autodeploy directory & removing as
needed.  Now it is using the asadmin commands "deploy" and "undeploy"
sub commands.
parent 246b324b
No related branches found
No related tags found
No related merge requests found
...@@ -35,6 +35,9 @@ if [ ! -z "$1" ]; then ...@@ -35,6 +35,9 @@ if [ ! -z "$1" ]; then
fi fi
echo "Backing up $DM_DB_NAME" echo "Backing up $DM_DB_NAME"
#assign default domain name domain1 if it was not previously set.
DM_DOMAIN_NAME=${DM_DOMAIN_NAME:=domain1}
# Look for deployment file in etc directory, and use it to override # Look for deployment file in etc directory, and use it to override
# default entries # default entries
deployConfigFile=$DM_ROOT_DIR/etc/${DM_DB_NAME}.deploy.conf deployConfigFile=$DM_ROOT_DIR/etc/${DM_DB_NAME}.deploy.conf
...@@ -114,7 +117,7 @@ rm -f $processingFile ...@@ -114,7 +117,7 @@ rm -f $processingFile
# Backup web app # Backup web app
#echo "Backing up $DM_DB_NAME web app" #echo "Backing up $DM_DB_NAME web app"
#rsync -arlvP $DM_SUPPORT_DIR/opt/payara/glassfish/domains/domain1/autodeploy/$DM_DB_NAME.war $DM_BACKUP_DIR #rsync -arlvP $DM_SUPPORT_DIR/opt/payara/glassfish/domains/$DM_DOMAIN_NAME/autodeploy/$DM_DB_NAME.war $DM_BACKUP_DIR
cleanup cleanup
echo "Backup of DB $DM_DB_NAME is done." echo "Backup of DB $DM_DB_NAME is done."
......
...@@ -27,6 +27,9 @@ if [ ! -z "$1" ]; then ...@@ -27,6 +27,9 @@ if [ ! -z "$1" ]; then
fi fi
echo "Using DB name: $DM_DB_NAME" echo "Using DB name: $DM_DB_NAME"
#assign default domain name domain1 if it was not previously set.
DM_DOMAIN_NAME=${DM_DOMAIN_NAME:=domain1}
# Look for deployment file in etc directory, and use it to override # Look for deployment file in etc directory, and use it to override
# default entries # default entries
deployConfigFile=$DM_ROOT_DIR/etc/${DM_DB_NAME}.deploy.conf deployConfigFile=$DM_ROOT_DIR/etc/${DM_DB_NAME}.deploy.conf
...@@ -53,11 +56,10 @@ DM_DB_USER=${DM_DB_USER:=dm} ...@@ -53,11 +56,10 @@ DM_DB_USER=${DM_DB_USER:=dm}
DM_DB_PASSWORD=${DM_DB_PASSWORD:=dm} DM_DB_PASSWORD=${DM_DB_PASSWORD:=dm}
DM_DB_POOL=postgresql_${DM_DB_NAME}_DbPool DM_DB_POOL=postgresql_${DM_DB_NAME}_DbPool
DM_DATA_SOURCE=${DM_DB_NAME}_DataSource DM_DATA_SOURCE=${DM_DB_NAME}_DataSource
DM_DOMAIN=domain1
# copy db driver # copy db driver
echo "Copying db driver" echo "Copying db driver"
rsync -ar $DM_ROOT_DIR/src/java/DmWebPortal/lib/postgresql*.jdbc41.jar $PAYARA_DIR/glassfish/domains/${DM_DOMAIN}/lib/ext rsync -ar $DM_ROOT_DIR/src/java/DmWebPortal/lib/postgresql*.jdbc41.jar $PAYARA_DIR/glassfish/domains/${DM_DOMAIN_NAME}/lib/ext
# Check password from file # Check password from file
passwordFile=$DM_INSTALL_DIR/etc/$DM_DB_NAME.db.passwd passwordFile=$DM_INSTALL_DIR/etc/$DM_DB_NAME.db.passwd
...@@ -67,8 +69,8 @@ fi ...@@ -67,8 +69,8 @@ fi
# restart server # restart server
echo "Restarting payara" echo "Restarting payara"
$ASADMIN_CMD stop-domain ${DM_DOMAIN} $ASADMIN_CMD stop-domain ${DM_DOMAIN_NAME}
$ASADMIN_CMD start-domain ${DM_DOMAIN} $ASADMIN_CMD start-domain ${DM_DOMAIN_NAME}
# create JDBC connection pool # create JDBC connection pool
echo "Creating JDBC connection pool $DM_DB_POOL" echo "Creating JDBC connection pool $DM_DB_POOL"
...@@ -78,9 +80,6 @@ $ASADMIN_CMD create-jdbc-connection-pool --datasourceclassname org.postgresql.ds ...@@ -78,9 +80,6 @@ $ASADMIN_CMD create-jdbc-connection-pool --datasourceclassname org.postgresql.ds
echo "Creating JDBC resource $DM_DATA_SOURCE" echo "Creating JDBC resource $DM_DATA_SOURCE"
$ASADMIN_CMD create-jdbc-resource --connectionpoolid ${DM_DB_POOL} ${DM_DATA_SOURCE} $ASADMIN_CMD create-jdbc-resource --connectionpoolid ${DM_DB_POOL} ${DM_DATA_SOURCE}
# Remove unsecure access on port 8080
$ASADMIN_CMD delete-http-listener "http-listener-1"
# test the connection settings # test the connection settings
echo "Testing connection" echo "Testing connection"
$ASADMIN_CMD ping-connection-pool $DM_DB_POOL || exit 1 $ASADMIN_CMD ping-connection-pool $DM_DB_POOL || exit 1
......
...@@ -27,6 +27,10 @@ if [ ! -z "$1" ]; then ...@@ -27,6 +27,10 @@ if [ ! -z "$1" ]; then
fi fi
echo "Using DB name: $DM_DB_NAME" echo "Using DB name: $DM_DB_NAME"
#assign default domain name domain1 if it was not previously set. Override this
by defining in setup.sh
DM_DOMAIN_NAME=${DM_DOMAIN_NAME:=domain1}
# Look for deployment file in etc directory, and use it to override # Look for deployment file in etc directory, and use it to override
# default entries # default entries
deployConfigFile=$DM_ROOT_DIR/etc/${DM_DB_NAME}.deploy.conf deployConfigFile=$DM_ROOT_DIR/etc/${DM_DB_NAME}.deploy.conf
...@@ -43,7 +47,7 @@ DM_HOSTNAME=`hostname -f` ...@@ -43,7 +47,7 @@ DM_HOSTNAME=`hostname -f`
DM_DATE=`date +%Y.%m.%d` DM_DATE=`date +%Y.%m.%d`
DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm} DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
PAYARA_DIR=$DM_OPT_DIR/payara PAYARA_DIR=$DM_OPT_DIR/payara
DM_DEPLOY_DIR=$PAYARA_DIR/glassfish/domains/domain1/autodeploy #DM_DEPLOY_DIR=$PAYARA_DIR/glassfish/domains/$DM_DOMAIN_NAME/autodeploy
DM_PORTAL_DIST_DIR=$DM_ROOT_DIR/src/java/DmWebPortal/dist DM_PORTAL_DIST_DIR=$DM_ROOT_DIR/src/java/DmWebPortal/dist
DM_BASE_DIST_DIR=$DM_ROOT_DIR/src/java/DmBase/dist DM_BASE_DIST_DIR=$DM_ROOT_DIR/src/java/DmBase/dist
DM_API_DIST_DIR=$DM_ROOT_DIR/src/java/DmApi/dist DM_API_DIST_DIR=$DM_ROOT_DIR/src/java/DmApi/dist
...@@ -118,24 +122,24 @@ jar cf ../$DM_WAR_FILE * ...@@ -118,24 +122,24 @@ jar cf ../$DM_WAR_FILE *
export AS_JAVA=$JAVA_HOME export AS_JAVA=$JAVA_HOME
ASADMIN_CMD=$PAYARA_DIR/bin/asadmin ASADMIN_CMD=$PAYARA_DIR/bin/asadmin
# copy war file echo "Attempt to undeploy any current implementation of the application"
echo "Copying war file $DM_PORTAL_DIST_DIR/$DM_WAR_FILE to $DM_DEPLOY_DIR" $ASADMIN_CMD undeploy $DM_CONTEXT_ROOT
rm -f $DM_DEPLOY_DIR/${DM_WAR_FILE}_* echo "Attempting to deploy a new version of the application"
cp $DM_PORTAL_DIST_DIR/$DM_WAR_FILE $DM_DEPLOY_DIR $ASADMIN_CMD deploy $DM_PORTAL_DIST_DIR/$DM_WAR_FILE
# wait on deployment # wait on deployment
echo "Waiting on war deployment..." #echo "Waiting on war deployment..."
WAIT_TIME=60 #WAIT_TIME=60
cd $DM_DEPLOY_DIR #cd $DM_DEPLOY_DIR
t=0 #t=0
while [ $t -lt $WAIT_TIME ]; do #while [ $t -lt $WAIT_TIME ]; do
sleep 1 # sleep 1
deploymentStatus=`ls -c1 ${DM_WAR_FILE}_* 2> /dev/null | sed 's?.*war_??g'` # deploymentStatus=`ls -c1 ${DM_WAR_FILE}_* 2> /dev/null | sed 's?.*war_??g'`
if [ ! -z "$deploymentStatus" ]; then # if [ ! -z "$deploymentStatus" ]; then
break # break
fi # fi
t=`expr $t + 1` # t=`expr $t + 1`
done #done
echo "Deployment Status: $deploymentStatus" #echo "Deployment Status: $deploymentStatus"
...@@ -37,6 +37,9 @@ else ...@@ -37,6 +37,9 @@ else
echo "Deployment config file $deployConfigFile not found, using defaults" echo "Deployment config file $deployConfigFile not found, using defaults"
fi fi
#assign default domain name domain1 if it was not previously set.
DM_DOMAIN_NAME=${DM_DOMAIN_NAME:=domain1}
DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m` DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
PAYARA_DIR=$DM_OPT_DIR/payara PAYARA_DIR=$DM_OPT_DIR/payara
...@@ -46,12 +49,11 @@ ASADMIN_CMD=$PAYARA_DIR/bin/asadmin ...@@ -46,12 +49,11 @@ ASADMIN_CMD=$PAYARA_DIR/bin/asadmin
DM_DB_POOL=postgresql_${DM_DB_NAME}_DbPool DM_DB_POOL=postgresql_${DM_DB_NAME}_DbPool
DM_DATA_SOURCE=${DM_DB_NAME}_DataSource DM_DATA_SOURCE=${DM_DB_NAME}_DataSource
DM_DOMAIN=domain1
# restart server # restart server
echo "Restarting payara" echo "Restarting payara"
$ASADMIN_CMD stop-domain ${DM_DOMAIN} $ASADMIN_CMD stop-domain ${DM_DOMAIN_NAME}
$ASADMIN_CMD start-domain ${DM_DOMAIN} $ASADMIN_CMD start-domain ${DM_DOMAIN_NAME}
# delete JDBC resource associated with this connection pool # delete JDBC resource associated with this connection pool
echo "Deleting JDBC resource $DM_DATA_SOURCE" echo "Deleting JDBC resource $DM_DATA_SOURCE"
......
...@@ -27,6 +27,9 @@ if [ ! -z "$1" ]; then ...@@ -27,6 +27,9 @@ if [ ! -z "$1" ]; then
fi fi
echo "Using DB name: $DM_DB_NAME" echo "Using DB name: $DM_DB_NAME"
#assign default domain name domain1 if it was not previously set.
DM_DOMAIN_NAME=${DM_DOMAIN_NAME:=domain1}
# Look for deployment file in etc directory, and use it to override # Look for deployment file in etc directory, and use it to override
# default entries # default entries
deployConfigFile=$DM_ROOT_DIR/etc/${DM_DB_NAME}.deploy.conf deployConfigFile=$DM_ROOT_DIR/etc/${DM_DB_NAME}.deploy.conf
...@@ -41,17 +44,21 @@ DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m` ...@@ -41,17 +44,21 @@ DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm} DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
PAYARA_DIR=$DM_OPT_DIR/payara PAYARA_DIR=$DM_OPT_DIR/payara
DM_DEPLOY_DIR=$PAYARA_DIR/glassfish/domains/domain1/autodeploy DM_DOMAIN_DIR=$PAYARA_DIR/glassfish/domains/$DM_DOMAIN_NAME
DM_APP_DIR=$PAYARA_DIR/glassfish/domains/domain1/applications/$DM_CONTEXT_ROOT #DM_DEPLOY_DIR=$DM_DOMAIN_DIR/autodeploy
DM_APP_DIR=$DM_DOMAIN_DIR/applications/$DM_CONTEXT_ROOT
DM_DIST_DIR=$DM_ROOT_DIR/src/java/DmWebPortal/dist DM_DIST_DIR=$DM_ROOT_DIR/src/java/DmWebPortal/dist
DM_WAR_FILE=$DM_CONTEXT_ROOT.war DM_WAR_FILE=$DM_CONTEXT_ROOT.war
export AS_JAVA=$JAVA_HOME export AS_JAVA=$JAVA_HOME
ASADMIN_CMD=$PAYARA_DIR/bin/asadmin ASADMIN_CMD=$PAYARA_DIR/bin/asadmin
echo "Undeploying the application"
$ASADMIN_CMD undeploy $DM_CONTEXT_ROOT
# remove war file from autodeploy directory # remove war file from autodeploy directory
echo "Removing war file $DM_DEPLOY_DIR/$DM_WAR_FILE" #echo "Removing war file $DM_DEPLOY_DIR/$DM_WAR_FILE"
rm -f $DM_DEPLOY_DIR/${DM_WAR_FILE}* #rm -f $DM_DEPLOY_DIR/${DM_WAR_FILE}*
# remove war file from autodeploy directory # remove war file from autodeploy directory
if [ -d $DM_APP_DIR ]; then if [ -d $DM_APP_DIR ]; then
...@@ -63,8 +70,8 @@ fi ...@@ -63,8 +70,8 @@ fi
# restart server # restart server
echo "Restarting payara" echo "Restarting payara"
$ASADMIN_CMD stop-domain ${DM_DOMAIN} $ASADMIN_CMD stop-domain ${DM_DOMAIN_NAME}
$ASADMIN_CMD start-domain ${DM_DOMAIN} $ASADMIN_CMD start-domain ${DM_DOMAIN_NAME}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment