aboutsummaryrefslogtreecommitdiffstats
path: root/packages/apex-pdp-package-full
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2020-08-04 21:36:47 -0500
committerjhh <jorge.hernandez-herrero@att.com>2020-08-04 21:37:30 -0500
commit978e74174313276578344240ae7175e68cb66997 (patch)
tree5b1bf9c86e98f362d3dcab3c422bb56b67bdbefa /packages/apex-pdp-package-full
parent56e4f452342da2d0a9e0fb822c68b3440476092a (diff)
environment variables to support cert. store paths
Issue-ID: POLICY-2615 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I746f1be50f7a85c0febddc9a92576bb2dbcd9a06
Diffstat (limited to 'packages/apex-pdp-package-full')
-rwxr-xr-xpackages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh11
1 files changed, 7 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 de8f2b59b..93c254c04 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
@@ -1,9 +1,10 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -x
#-------------------------------------------------------------------------------
# ============LICENSE_START=======================================================
# Copyright (C) 2016-2018 Ericsson. All rights reserved.
# Modifications Copyright (C) 2019-2020 Nordix Foundation.
+# Modifications Copyright (C) 2020 AT&T Intellectual Property.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -48,11 +49,13 @@ then
fi
## Environment variables for HTTPS
-KEYSTORE="${APEX_HOME}/etc/ssl/policy-keystore"
-TRUSTSTORE="${APEX_HOME}/etc/ssl/policy-truststore"
+KEYSTORE="${KEYSTORE:-$APEX_HOME/etc/ssl/policy-keystore}"
+TRUSTSTORE="${TRUSTSTORE:-$APEX_HOME/etc/ssl/policy-truststore}"
+KEYSTORE_PASSWORD="${KEYSTORE_PASSWORD:-Pol1cy_0nap}"
+TRUSTSTORE_PASSWORD="${TRUSTSTORE_PASSWORD:-Pol1cy_0nap}"
## HTTPS parameters
-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}"
+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
MOD_SCRIPT_NAME=`basename $0`