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/27 10:50:52 UTC
ranger git commit: RANGER-1668:Do some code improvement in setup.sh
of security-admin
Repository: ranger
Updated Branches:
refs/heads/master 84d132fcf -> f6029f1cc
RANGER-1668:Do some code improvement in setup.sh of security-admin
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/f6029f1c
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f6029f1c
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f6029f1c
Branch: refs/heads/master
Commit: f6029f1cc926d8f487368216deb9dbebb3074eac
Parents: 84d132f
Author: peng.jianhua <pe...@zte.com.cn>
Authored: Tue Jun 27 09:45:30 2017 +0800
Committer: peng.jianhua <pe...@zte.com.cn>
Committed: Tue Jun 27 06:44:14 2017 -0400
----------------------------------------------------------------------
security-admin/scripts/setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/f6029f1c/security-admin/scripts/setup.sh
----------------------------------------------------------------------
diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh
index f49bb13..1630684 100755
--- a/security-admin/scripts/setup.sh
+++ b/security-admin/scripts/setup.sh
@@ -1218,13 +1218,13 @@ setup_install_files(){
if [ "${hadoop_conf}" == "" ]
then
log "[WARN] Property hadoop_conf not found. Creating blank core-site.xml."
- echo "<configuration></configuration>" > ${WEBAPP_ROOT}/WEB-INF/classes/conf/core-site.xml
+ echo "<configuration></configuration>" > ${ranger_hadoop_conf_file}
else
if [ -f ${hadoop_conf_file} ]; then
- ln -sf ${hadoop_conf_file} ${WEBAPP_ROOT}/WEB-INF/classes/conf/core-site.xml
+ ln -sf ${hadoop_conf_file} ${ranger_hadoop_conf_file}
else
log "[WARN] core-site.xml file not found in provided hadoop_conf path. Creating blank core-site.xml"
- echo "<configuration></configuration>" > ${WEBAPP_ROOT}/WEB-INF/classes/conf/core-site.xml
+ echo "<configuration></configuration>" > ${ranger_hadoop_conf_file}
fi
fi
fi