summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRossC <ross.carter@est.tech>2020-07-15 16:19:24 +0100
committerRossC <ross.carter@est.tech>2020-07-15 16:19:32 +0100
commit571c69058588a9eeccf45c030bf682a86b2e87f3 (patch)
treeb69f6a1d2cf78ea1d547028013e5bbcdfc6a7818
parent592e04f6301dd38ae48d38501cc251fc3d5ad2fb (diff)
Renaming password variables to match with oom
Issue-ID: POLICY-2633 Change-Id: If5df0e82ab4154f5e32cdc3a5080cb13264830aa Signed-off-by: RossC <ross.carter@est.tech>
-rwxr-xr-xpackages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat10
-rwxr-xr-xpackages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh2
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
index b5a92fd5a..00cec4a0f 100755
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
@@ -32,12 +32,12 @@
@echo off
setlocal enableDelayedExpansion
-if not defined KEYSTORE_PASSWD (
- set KEYSTORE_PASSWD=Pol1cy_0nap
+if not defined KEYSTORE_PASSWORD (
+ set KEYSTORE_PASSWORD=Pol1cy_0nap
)
-if not defined TRUSTSTORE_PASSWD (
- set TRUSTSTORE_PASSWD=Pol1cy_0nap
+if not defined TRUSTSTORE_PASSWORD (
+ set TRUSTSTORE_PASSWORD=Pol1cy_0nap
)
if defined APEX_HOME (
@@ -63,7 +63,7 @@ set KEYSTORE=%APEX_HOME%/etc/ssl/policy-keystore"
set TRUSTSTORE=%APEX_HOME%/etc/ssl/policy-truststore"
:: HTTPS parameters
-set HTTPS_PARAMETERS=-Djavax.net.ssl.keyStore=%KEYSTORE% -Djavax.net.ssl.keyStorePassword=%KEYSTORE_PASSWD% -Djavax.net.ssl.trustStore=%TRUSTSTORE% -Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASSWD%
+set HTTPS_PARAMETERS=-Djavax.net.ssl.keyStore=%KEYSTORE% -Djavax.net.ssl.keyStorePassword=%KEYSTORE_PASSWORD% -Djavax.net.ssl.trustStore=%TRUSTSTORE% -Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASSWORD%
:: script name for output
set MOD_SCRIPT_NAME=apexApps
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 8f966369d..de8f2b59b 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
@@ -52,7 +52,7 @@ KEYSTORE="${APEX_HOME}/etc/ssl/policy-keystore"
TRUSTSTORE="${APEX_HOME}/etc/ssl/policy-truststore"
## HTTPS parameters
-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}"
+HTTPS_PARAMETERS="-Djavax.net.ssl.keyStore=${KEYSTORE} -Djavax.net.ssl.keyStorePassword=${KEYSTORE_PASSWORD:-Pol1cy_0nap} -Djavax.net.ssl.trustStore=$TRUSTSTORE -Djavax.net.ssl.trustStorePassword=${TRUSTSTORE_PASSWORD:-Pol1cy_0nap}"
## script name for output
MOD_SCRIPT_NAME=`basename $0`