[nifi-registry] branch master updated: Add prop_replace command to update nifi.registry.security.keyPasswd using either the KEY_PASSWORD or KEYSTORE_PASSWORD environment variable

[pvillard]

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
     new 100ff2b  Add prop_replace command to update 
nifi.registry.security.keyPasswd using either the KEY_PASSWORD or 
KEYSTORE_PASSWORD environment variable
100ff2b is described below

commit 100ff2b00b5b58327fc95689a3fb958cb6dbd9dd
Author: Justin Rittenhouse <jritt...@nd.edu>
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 <pierre.villard...@gmail.com>
    
    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}"