From 4d285f5e9dc89713cd1033a38959ca291926c16f Mon Sep 17 00:00:00 2001
From: JPHammonds <JPHammonds@anl.gov>
Date: Fri, 2 Aug 2019 16:25:34 -0500
Subject: [PATCH] Change to allow changing the domain name using DM_DOMAIN_NAME
in setup.sh. Still defaults to domain1 even if this is not set in the
setup.sh.
---
etc/init.d/dm-payara | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/etc/init.d/dm-payara b/etc/init.d/dm-payara
index 947460e3..df251339 100755
--- a/etc/init.d/dm-payara
+++ b/etc/init.d/dm-payara
@@ -32,14 +32,18 @@ if [ ! -f ${DM_ENV_FILE} ]; then
fi
. ${DM_ENV_FILE} > /dev/null
+#Assign a default domain name to DM_DOMAIN_NAME. This can be modified by
+# assigning in setup.sh.
+DM_DOMAIN_NAME=${DM_DOMAIN_NAME:domain1}
+
export AS_JAVA=$DM_OPT_DIR/java/$DM_HOST_ARCH
DM_PAYARA_DIR=$DM_OPT_DIR/payara
DERBY_DIR=$DM_OPT_DIR/payara/javadb/bin
DM_DAEMON_NAME=payara
DM_DAEMON_CONTROL_CMD=$DM_PAYARA_DIR/bin/asadmin
-DM_DAEMON_START_ARGS="start-domain domain1"
-DM_DAEMON_STOP_ARGS="stop-domain domain1"
+DM_DAEMON_START_ARGS="start-domain $DM_DOMAIN_NAME"
+DM_DAEMON_STOP_ARGS="stop-domain $DM_DOMAIN_NAME"
DM_DAEMON_STATUS_CMDS="uptime list-domains list-applications list-jdbc-resources"
start() {
--
GitLab