You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by zh...@apache.org on 2017/06/19 09:46:58 UTC
ranger git commit: RANGER-1652:Clean invalid code for kms installer
to improve code clarity and execution efficiency.
Repository: ranger
Updated Branches:
refs/heads/master fdd1d294c -> 7e75e9b1c
RANGER-1652:Clean invalid code for kms installer to improve code clarity and execution efficiency.
Signed-off-by: peng.jianhua <pe...@zte.com.cn>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/7e75e9b1
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/7e75e9b1
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/7e75e9b1
Branch: refs/heads/master
Commit: 7e75e9b1c4a0e6dd64d3ff09da1f713bc43b7e26
Parents: fdd1d29
Author: peng.jianhua <pe...@zte.com.cn>
Authored: Mon Jun 19 05:03:02 2017 -0400
Committer: peng.jianhua <pe...@zte.com.cn>
Committed: Mon Jun 19 05:43:47 2017 -0400
----------------------------------------------------------------------
kms/scripts/setup.sh | 37 +++++--------------------------------
1 file changed, 5 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/7e75e9b1/kms/scripts/setup.sh
----------------------------------------------------------------------
diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh
index 297fdd2..be706b6 100755
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh
@@ -22,8 +22,6 @@
PROPFILE=$PWD/install.properties
propertyValue=''
-CONF_FILE=$PWD/ews/webapp/WEB-INF/classes/conf
-ETC_CONF_FILE=/etc/ranger/kms/conf
pidFolderName='/var/run/ranger_kms'
if [ ! -d "${pidFolderName}" ]; then
mkdir -p "${pidFolderName}"
@@ -234,36 +232,11 @@ init_variables(){
fi
log "[I] DB_FLAVOR=${DB_FLAVOR}"
########## HSM Config ##########
-
- propertyName=ranger.ks.hsm.enabled
- HSM_ENABLED=`echo $HSM_ENABLED | tr '[:lower:]' '[:upper:]'`
- password_validation "$KMS_MASTER_KEY_PASSWD" "KMS Master key"
-
- #getPropertyFromFile 'db_root_user' $PROPFILE db_root_user
- #getPropertyFromFile 'db_root_password' $PROPFILE db_user
- #getPropertyFromFile 'db_user' $PROPFILE db_user
- #getPropertyFromFile 'db_password' $PROPFILE db_password
-
- #if [ -L ${CONF_FILE} ]
- # then
- # log "Deleting conf symlink"
- # rm -f ${CONF_FILE}
- # fi
-
- # if [ -f ${ETC_CONF_FILE} ]
- # then
- # log "Deleting /etc/ranger/kms/conf file"
- # rm -f ${ETC_CONF_FILE}
- # fi
-
- # if [ ! -d ${ETC_CONF_FILE} ]
- # then
- # log "Creating /etc/ranger/kms/conf dir"
- # mkdir -p ${ETC_CONF_FILE}
- # fi
-
- # log "Create link of conf -> /etc/ranger/kms/conf"
- # ln -sf ${ETC_CONF_FILE} ${CONF_FILE}
+
+ propertyName=ranger.ks.hsm.enabled
+ HSM_ENABLED=`echo $HSM_ENABLED | tr '[:lower:]' '[:upper:]'`
+ password_validation "$KMS_MASTER_KEY_PASSWD" "KMS Master key"
+
db_ssl_enabled=`echo $db_ssl_enabled | tr '[:upper:]' '[:lower:]'`
if [ "${db_ssl_enabled}" != "true" ]
then