diff options
| author |   Liam Fallon <liam.fallon@est.tech> | 2020-07-13 11:37:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-07-13 11:37:37 +0000 |
| commit | b09f7de07ee653397d1287314260f1df67b66bf6 (patch) | |
| tree | 66dd1f93c332eed1a058e0cb5e21faa8c4e42877 /packages/apex-pdp-package-full | |
| parent | 2a2d8564fc10258cd7f9b402c4622d7f55688e55 (diff) | |
| parent | 4fa70c44a1ab334780852a46db94d197538e75ed (diff) | |
Merge "Allowing configuration of truststore password"
Diffstat (limited to 'packages/apex-pdp-package-full')
| -rwxr-xr-x[-rw-r--r--] | packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat | 9 | ||||
| -rwxr-xr-x | packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh | 6 |
2 files changed, 9 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 6610c109e..b5a92fd5a 100644..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,6 +32,13 @@ @echo off setlocal enableDelayedExpansion +if not defined KEYSTORE_PASSWD ( + set KEYSTORE_PASSWD=Pol1cy_0nap +) + +if not defined TRUSTSTORE_PASSWD ( + set TRUSTSTORE_PASSWD=Pol1cy_0nap +) if defined APEX_HOME ( if exist "%APEX_HOME%\" ( @@ -53,9 +60,7 @@ if defined APEX_HOME ( :: Environment variables for HTTPS set KEYSTORE=%APEX_HOME%/etc/ssl/policy-keystore" -set KEYSTORE_PASSWD="Pol1cy_0nap" set TRUSTSTORE=%APEX_HOME%/etc/ssl/policy-truststore" -set TRUSTSTORE_PASSWD="Pol1cy_0nap" :: 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% 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` |