@@ -90,10 +90,10 @@ rangerAdmin_password=$(get_prop 'rangerAdmin_password' $PROPFILE)
9090rangerTagsync_password=$( get_prop ' rangerTagsync_password' $PROPFILE )
9191rangerUsersync_password=$( get_prop ' rangerUsersync_password' $PROPFILE )
9292keyadmin_password=$( get_prop ' keyadmin_password' $PROPFILE )
93- javax_net_ssl_keyStore=$( get_prop ' javax_net_ssl_keyStore' $PROPFILE )
94- javax_net_ssl_keyStorePassword=$( get_prop ' javax_net_ssl_keyStorePassword' $PROPFILE )
95- javax_net_ssl_trustStore=$( get_prop ' javax_net_ssl_trustStore' $PROPFILE )
96- javax_net_ssl_trustStorePassword=$( get_prop ' javax_net_ssl_trustStorePassword' $PROPFILE )
93+ javax_net_ssl_keyStore=$( get_prop_or_default ' javax_net_ssl_keyStore' $PROPFILE ' ' )
94+ javax_net_ssl_keyStorePassword=$( get_prop_or_default ' javax_net_ssl_keyStorePassword' $PROPFILE ' ' )
95+ javax_net_ssl_trustStore=$( get_prop_or_default ' javax_net_ssl_trustStore' $PROPFILE ' ' )
96+ javax_net_ssl_trustStorePassword=$( get_prop_or_default ' javax_net_ssl_trustStorePassword' $PROPFILE ' ' )
9797audit_store=$( get_prop ' audit_store' $PROPFILE )
9898audit_elasticsearch_urls=$( get_prop ' audit_elasticsearch_urls' $PROPFILE )
9999audit_elasticsearch_protocol=$( get_prop ' audit_elasticsearch_protocol' $PROPFILE )
@@ -103,9 +103,9 @@ audit_elasticsearch_password=$(get_prop 'audit_elasticsearch_password' $PROPFILE
103103audit_elasticsearch_index=$( get_prop ' audit_elasticsearch_index' $PROPFILE )
104104audit_elasticsearch_bootstrap_enabled=$( get_prop ' audit_elasticsearch_bootstrap_enabled' $PROPFILE )
105105audit_solr_urls=$( get_prop ' audit_solr_urls' $PROPFILE )
106- audit_solr_user=$( get_prop ' audit_solr_user' $PROPFILE )
107- audit_solr_password=$( get_prop ' audit_solr_password' $PROPFILE )
108- audit_solr_zookeepers=$( get_prop ' audit_solr_zookeepers' $PROPFILE )
106+ audit_solr_user=$( get_prop_or_default ' audit_solr_user' $PROPFILE ' ' )
107+ audit_solr_password=$( get_prop_or_default ' audit_solr_password' $PROPFILE ' ' )
108+ audit_solr_zookeepers=$( get_prop_or_default ' audit_solr_zookeepers' $PROPFILE ' ' )
109109audit_cloudwatch_region=$( get_prop ' audit_cloudwatch_region' $PROPFILE )
110110audit_cloudwatch_log_group=$( get_prop ' audit_cloudwatch_log_group' $PROPFILE )
111111audit_cloudwatch_log_stream_prefix=$( get_prop ' audit_cloudwatch_log_stream_prefix' $PROPFILE )
@@ -114,18 +114,18 @@ policymgr_http_enabled=$(get_prop 'policymgr_http_enabled' $PROPFILE)
114114policymgr_https_keystore_file=$( get_prop ' policymgr_https_keystore_file' $PROPFILE )
115115policymgr_https_keystore_keyalias=$( get_prop ' policymgr_https_keystore_keyalias' $PROPFILE )
116116policymgr_https_keystore_password=$( get_prop ' policymgr_https_keystore_password' $PROPFILE )
117- policymgr_supportedcomponents=$( get_prop ' policymgr_supportedcomponents' $PROPFILE )
117+ policymgr_supportedcomponents=$( get_prop_or_default ' policymgr_supportedcomponents' $PROPFILE ' ' )
118118unix_user=$( get_prop ' unix_user' $PROPFILE )
119119unix_user_pwd=$( get_prop ' unix_user_pwd' $PROPFILE )
120120unix_group=$( get_prop ' unix_group' $PROPFILE )
121121authentication_method=$( get_prop ' authentication_method' $PROPFILE )
122- remoteLoginEnabled=$( get_prop ' remoteLoginEnabled' $PROPFILE )
123- authServiceHostName=$( get_prop ' authServiceHostName' $PROPFILE )
124- authServicePort=$( get_prop ' authServicePort' $PROPFILE )
125- ranger_unixauth_keystore=$( get_prop ' ranger_unixauth_keystore' $PROPFILE )
126- ranger_unixauth_keystore_password=$( get_prop ' ranger_unixauth_keystore_password' $PROPFILE )
127- ranger_unixauth_truststore=$( get_prop ' ranger_unixauth_truststore' $PROPFILE )
128- ranger_unixauth_truststore_password=$( get_prop ' ranger_unixauth_truststore_password' $PROPFILE )
122+ remoteLoginEnabled=$( get_prop_or_default ' remoteLoginEnabled' $PROPFILE ' false ' )
123+ authServiceHostName=$( get_prop_or_default ' authServiceHostName' $PROPFILE ' ' )
124+ authServicePort=$( get_prop_or_default ' authServicePort' $PROPFILE ' ' )
125+ ranger_unixauth_keystore=$( get_prop_or_default ' ranger_unixauth_keystore' $PROPFILE ' ' )
126+ ranger_unixauth_keystore_password=$( get_prop_or_default ' ranger_unixauth_keystore_password' $PROPFILE ' ' )
127+ ranger_unixauth_truststore=$( get_prop_or_default ' ranger_unixauth_truststore' $PROPFILE ' ' )
128+ ranger_unixauth_truststore_password=$( get_prop_or_default ' ranger_unixauth_truststore_password' $PROPFILE ' ' )
129129xa_ldap_url=$( get_prop ' xa_ldap_url' $PROPFILE )
130130xa_ldap_userDNpattern=$( get_prop ' xa_ldap_userDNpattern' $PROPFILE )
131131xa_ldap_groupSearchBase=$( get_prop ' xa_ldap_groupSearchBase' $PROPFILE )
@@ -172,21 +172,21 @@ RANGER_PID_DIR_PATH=$(eval echo "$(get_prop 'RANGER_PID_DIR_PATH' $PROPFILE)")
172172spnego_principal=$( get_prop ' spnego_principal' $PROPFILE )
173173spnego_keytab=$( get_prop ' spnego_keytab' $PROPFILE )
174174token_valid=$( get_prop ' token_valid' $PROPFILE )
175- cookie_domain=$( get_prop ' cookie_domain' $PROPFILE )
176- cookie_path=$( get_prop ' cookie_path' $PROPFILE )
175+ cookie_domain=$( get_prop_or_default ' cookie_domain' $PROPFILE ' ' )
176+ cookie_path=$( get_prop_or_default ' cookie_path' $PROPFILE ' ' )
177177admin_principal=$( get_prop ' admin_principal' $PROPFILE )
178178admin_keytab=$( get_prop ' admin_keytab' $PROPFILE )
179179lookup_principal=$( get_prop ' lookup_principal' $PROPFILE )
180180lookup_keytab=$( get_prop ' lookup_keytab' $PROPFILE )
181181hadoop_conf=$( get_prop ' hadoop_conf' $PROPFILE )
182182audit_solr_collection_name=$( get_prop ' audit_solr_collection_name' $PROPFILE )
183- audit_solr_config_name=$( get_prop ' audit_solr_config_name' $PROPFILE )
184- audit_solr_configset_location=$( get_prop ' audit_solr_configset_location' $PROPFILE )
185- audit_solr_no_shards=$( get_prop ' audit_solr_no_shards' $PROPFILE )
186- audit_solr_no_replica=$( get_prop ' audit_solr_no_replica' $PROPFILE )
187- audit_solr_max_shards_per_node=$( get_prop ' audit_solr_max_shards_per_node' $PROPFILE )
188- audit_solr_acl_user_list_sasl=$( get_prop ' audit_solr_acl_user_list_sasl' $PROPFILE )
189- audit_solr_bootstrap_enabled=$( get_prop ' audit_solr_bootstrap_enabled' $PROPFILE )
183+ audit_solr_config_name=$( get_prop_or_default ' audit_solr_config_name' $PROPFILE ' ' )
184+ audit_solr_configset_location=$( get_prop_or_default ' audit_solr_configset_location' $PROPFILE ' ' )
185+ audit_solr_no_shards=$( get_prop_or_default ' audit_solr_no_shards' $PROPFILE ' ' )
186+ audit_solr_no_replica=$( get_prop_or_default ' audit_solr_no_replica' $PROPFILE ' ' )
187+ audit_solr_max_shards_per_node=$( get_prop_or_default ' audit_solr_max_shards_per_node' $PROPFILE ' ' )
188+ audit_solr_acl_user_list_sasl=$( get_prop_or_default ' audit_solr_acl_user_list_sasl' $PROPFILE ' ' )
189+ audit_solr_bootstrap_enabled=$( get_prop_or_default ' audit_solr_bootstrap_enabled' $PROPFILE ' ' )
190190
191191DB_HOST=" ${db_host} "
192192
0 commit comments