diff options
| author |   jhh <jorge.hernandez-herrero@att.com> | 2019-09-04 07:42:22 -0500 |
|---|---|---|
| committer | jhh <jorge.hernandez-herrero@att.com> | 2019-09-04 07:42:22 -0500 |
| commit | 7394337bf875e7dd7caae65533b7c32196f1542c (patch) | |
| tree | fb4ecfe40664dd04ed1cca2d89903c9d8b02c187 | |
| parent | 3c9d3dbbe614e4eecd7c2031a0185671cbf8a1bf (diff) | |
correction when overriding with external truststore
Issue-ID: POLICY-1371
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: Ief22f9d99acbd9c3d7335e59045d45c64296f783
2 files changed, 2 insertions, 5 deletions
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment index dba0d20bc..84bef12f9 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment @@ -41,9 +41,6 @@ vfc.password=${env:VFC_PASSWORD} pdpx.host=${env:PDP_HOST} pdpx.username=${env:PDP_USERNAME} pdpx.password=${env:PDP_PASSWORD} -pdpx.environment=${env:PDP_ENVIRONMENT} -pdpx.client.username=${env:PDP_CLIENT_USERNAME} -pdpx.client.password=${env:PDP_CLIENT_PASSWORD} guard.url=https://${env:PDP_HOST}:6969/policy/pdpx/v1/decision guard.jdbc.url=jdbc:mariadb://${env:SQL_HOST}:3306/operationshistory diff --git a/controlloop/packages/docker-controlloop/src/main/resources/docker-entrypoint.sh b/controlloop/packages/docker-controlloop/src/main/resources/docker-entrypoint.sh index 684c201ea..8e968be50 100644 --- a/controlloop/packages/docker-controlloop/src/main/resources/docker-entrypoint.sh +++ b/controlloop/packages/docker-controlloop/src/main/resources/docker-entrypoint.sh @@ -85,12 +85,12 @@ function security { if [[ -f "${POLICY_INSTALL_INIT}"/policy-keystore ]]; then if ! cmp -s "${POLICY_INSTALL_INIT}"/policy-keystore "${POLICY_HOME}"/etc/ssl/policy-keystore; then - echo "overriding policy-keystore"policy-keystore + echo "overriding policy-keystore" cp -f "${POLICY_INSTALL_INIT}"/policy-keystore "${POLICY_HOME}"/etc/ssl fi fi - if [[ -f ${POLICY_INSTALL_INIT}/policy-keystore ]]; then + if [[ -f ${POLICY_INSTALL_INIT}/policy-truststore ]]; then if ! cmp -s "${POLICY_INSTALL_INIT}"/policy-truststore "${POLICY_HOME}"/etc/ssl/policy-truststore; then echo "overriding policy-truststore" cp -f "${POLICY_INSTALL_INIT}"/policy-truststore "${POLICY_HOME}"/etc/ssl |