summaryrefslogtreecommitdiffstats
path: root/controlloop
diff options
context:
space:
mode:
Diffstat (limited to 'controlloop')
-rw-r--r--controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment3
-rw-r--r--controlloop/packages/docker-controlloop/src/main/resources/docker-entrypoint.sh4
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