summaryrefslogtreecommitdiffstats
path: root/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
diff options
context:
space:
mode:
authorRossC <ross.carter@est.tech>2020-07-09 11:00:29 +0100
committerRossC <ross.carter@est.tech>2020-07-09 11:00:43 +0100
commit4fa70c44a1ab334780852a46db94d197538e75ed (patch)
tree2ecd06b882ffc640554027a99d3f50f39304193c /packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
parent871421fb99f7e6221b2c084e43a9388f618f882d (diff)
Allowing configuration of truststore password
Issue-ID: POLICY-2633 Change-Id: Ic891ab55ded843e44b7998097949c1156c070657 Signed-off-by: RossC <ross.carter@est.tech>
Diffstat (limited to 'packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh')
-rwxr-xr-xpackages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
index 5b6350a81..8f966369d 100755
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
@@ -49,12 +49,10 @@ fi
## Environment variables for HTTPS
KEYSTORE="${APEX_HOME}/etc/ssl/policy-keystore"
-KEYSTORE_PASSWD="Pol1cy_0nap"
TRUSTSTORE="${APEX_HOME}/etc/ssl/policy-truststore"
-TRUSTSTORE_PASSWD="Pol1cy_0nap"
## HTTPS parameters
-HTTPS_PARAMETERS="-Djavax.net.ssl.keyStore=${KEYSTORE} -Djavax.net.ssl.keyStorePassword=${KEYSTORE_PASSWD} -Djavax.net.ssl.trustStore=${TRUSTSTORE} -Djavax.net.ssl.trustStorePassword=${TRUSTSTORE_PASSWD}"
+HTTPS_PARAMETERS="-Djavax.net.ssl.keyStore=${KEYSTORE} -Djavax.net.ssl.keyStorePassword=${KEYSTORE_PASSWD:-Pol1cy_0nap} -Djavax.net.ssl.trustStore=$TRUSTSTORE -Djavax.net.ssl.trustStorePassword=${TRUSTSTORE_PASSWD:-Pol1cy_0nap}"
## script name for output
MOD_SCRIPT_NAME=`basename $0`
@@ -71,7 +69,7 @@ fi
_config="${HTTPS_PARAMETERS} -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -Dhazelcast.config=$APEX_HOME/etc/hazelcast.xml -Dhazelcast.mancenter.enabled=false"
## jmx test config
-_jmxconfig="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9911 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+_jmxconfig="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9911 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false "
## Maven/APEX version
_version=`cat $APEX_HOME/etc/app-version.txt`