diff options
| author |   Liam Fallon <liam.fallon@est.tech> | 2020-07-16 15:03:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-07-16 15:03:28 +0000 |
| commit | 28eced32d2acdf731f7782e14f37bf2ea8c98019 (patch) | |
| tree | 787a329a76d8c8e67ecf1561d144821d84d997f0 | |
| parent | 8180d5fc70e966973390c0981c694091c6e6df49 (diff) | |
| parent | 571c69058588a9eeccf45c030bf682a86b2e87f3 (diff) | |
Merge "Renaming password variables to match with oom"
| -rwxr-xr-x | packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat | 10 | ||||
| -rwxr-xr-x | packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh | 2 |
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` |