This is an automated email from the ASF dual-hosted git repository. aboda pushed a commit to branch NIFIREG-371-RC1 in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
commit 42acd047104644ff70f4e52e33217d9ad03a60a4 Author: Justin Rittenhouse <[email protected]> AuthorDate: Wed Mar 4 11:30:21 2020 -0500 Add prop_replace command to update nifi.registry.security.keyPasswd using either the KEY_PASSWORD or KEYSTORE_PASSWORD environment variable Signed-off-by: Pierre Villard <[email protected]> This closes #264. --- nifi-registry-core/nifi-registry-docker/dockerhub/sh/secure.sh | 1 + nifi-registry-docker-maven/dockermaven/sh/secure.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/nifi-registry-core/nifi-registry-docker/dockerhub/sh/secure.sh b/nifi-registry-core/nifi-registry-docker/dockerhub/sh/secure.sh index 352dfad..8a7a5bb 100644 --- a/nifi-registry-core/nifi-registry-docker/dockerhub/sh/secure.sh +++ b/nifi-registry-core/nifi-registry-docker/dockerhub/sh/secure.sh @@ -41,6 +41,7 @@ fi prop_replace 'nifi.registry.security.keystore' "${KEYSTORE_PATH}" prop_replace 'nifi.registry.security.keystoreType' "${KEYSTORE_TYPE}" prop_replace 'nifi.registry.security.keystorePasswd' "${KEYSTORE_PASSWORD}" +prop_replace 'nifi.registry.security.keyPasswd' "${KEY_PASSWORD:-$KEYSTORE_PASSWORD}" prop_replace 'nifi.registry.security.truststore' "${TRUSTSTORE_PATH}" prop_replace 'nifi.registry.security.truststoreType' "${TRUSTSTORE_TYPE}" prop_replace 'nifi.registry.security.truststorePasswd' "${TRUSTSTORE_PASSWORD}" diff --git a/nifi-registry-docker-maven/dockermaven/sh/secure.sh b/nifi-registry-docker-maven/dockermaven/sh/secure.sh index 352dfad..8a7a5bb 100644 --- a/nifi-registry-docker-maven/dockermaven/sh/secure.sh +++ b/nifi-registry-docker-maven/dockermaven/sh/secure.sh @@ -41,6 +41,7 @@ fi prop_replace 'nifi.registry.security.keystore' "${KEYSTORE_PATH}" prop_replace 'nifi.registry.security.keystoreType' "${KEYSTORE_TYPE}" prop_replace 'nifi.registry.security.keystorePasswd' "${KEYSTORE_PASSWORD}" +prop_replace 'nifi.registry.security.keyPasswd' "${KEY_PASSWORD:-$KEYSTORE_PASSWORD}" prop_replace 'nifi.registry.security.truststore' "${TRUSTSTORE_PATH}" prop_replace 'nifi.registry.security.truststoreType' "${TRUSTSTORE_TYPE}" prop_replace 'nifi.registry.security.truststorePasswd' "${TRUSTSTORE_PASSWORD}"
