Repository: hadoop Updated Branches: refs/heads/branch-2 85f7b7e8e -> dad7d0e2f
HADOOP-13911. Remove TRUSTSTORE_PASSWORD related scripts from KMS. Contributed by John Zhuge. (cherry picked from commit 30f85d7a88a110637757cf7a1f4cdc9ed40f59fb) Conflicts: hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dad7d0e2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dad7d0e2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dad7d0e2 Branch: refs/heads/branch-2 Commit: dad7d0e2ff23adc0bae420be60f40b688500c6a1 Parents: 85f7b7e Author: John Zhuge <jzh...@apache.org> Authored: Thu May 18 21:19:52 2017 -0700 Committer: John Zhuge <jzh...@apache.org> Committed: Thu May 18 21:33:59 2017 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh | 5 ----- hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml | 1 - 2 files changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dad7d0e2/hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh b/hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh index ce3c136..b843095 100644 --- a/hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh +++ b/hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh @@ -45,9 +45,6 @@ fi # it is used in Tomcat's server.xml configuration file # -# Mask the trustStorePassword -KMS_SSL_TRUSTSTORE_PASS=`echo $CATALINA_OPTS | grep -o 'trustStorePassword=[^ ]*' | awk -F'=' '{print $2}'` -CATALINA_OPTS_DISP=`echo ${CATALINA_OPTS} | sed -e 's/trustStorePassword=[^ ]*/trustStorePassword=***/'` print "Using CATALINA_OPTS: ${CATALINA_OPTS_DISP}" catalina_opts="-Dproc_kms" @@ -97,8 +94,6 @@ if [[ "${1}" = "start" || "${1}" = "run" ]]; then KMS_SSL_KEYSTORE_PASS=${KMS_SSL_KEYSTORE_PASS:-password} catalina_set_property "kms.ssl.keystore.pass" \ "${KMS_SSL_KEYSTORE_PASS}" "<redacted>" - catalina_set_property "kms.ssl.truststore.pass" \ - "${KMS_SSL_TRUSTSTORE_PASS}" "<redacted>" fi # A bug in catalina.sh script does not use CATALINA_OPTS for stopping the server http://git-wip-us.apache.org/repos/asf/hadoop/blob/dad7d0e2/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml b/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml index 73be5f8..6b63358 100644 --- a/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml +++ b/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml @@ -76,7 +76,6 @@ clientAuth="${kms.ssl.client.auth}" sslEnabledProtocols="${kms.ssl.enabled.protocols}" ciphers="${kms.ssl.ciphers}" - truststorePass="${kms.ssl.truststore.pass}" keystoreFile="${kms.ssl.keystore.file}" keystorePass="${kms.ssl.keystore.pass}"/> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org