[RANGER-1668] Do some code improvement in setup.sh of security-admin

• Type: Improvement
• Status: Resolved
• Priority: Minor
• Resolution: Fixed
• Fix Version/s: 1.0.0
• Component/s: Ranger
• Labels: patch
• Flags: Patch, Important
• Assignee: peng.jianhua
• Reporter: peng.jianhua
• Created: 27/Jun/17 01:40
• Updated: 27/Jun/17 10:54
• Resolved: 27/Jun/17 10:54

Description

ranger_hadoop_conf_file=${WEBAPP_ROOT}/WEB-INF/classes/conf/core-site.xml

The ranger_hadoop_conf_file variable had been defined and equaled to ${WEBAPP_ROOT}/WEB-INF/classes/conf/core-site.xml. So repeated ${WEBAPP_ROOT}/WEB-INF/classes/conf/core-site.xml should been replaced by ${ranger_hadoop_conf_file} in following code:

if [ -d ${WEBAPP_ROOT}/WEB-INF/classes/conf ]; then
   chown -R ${unix_user} ${WEBAPP_ROOT}/WEB-INF/classes/conf
   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
	else
	if [ -f ${hadoop_conf_file} ]; then
               ln -sf ${hadoop_conf_file} ${WEBAPP_ROOT}/WEB-INF/classes/conf/core-site.xml
        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
          fi
     fi
fi

Issue Links

• links to: https://reviews.apache.org/r/60452/