honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove CONF_FILE check 

This commit removes a legacy check for an unsupported environment
variable. This environment variable has not been supported since 1.x so
it is safe to stop checking for the existence of this setting.

Relates elastic/x-pack-elasticsearch#2048

Original commit: elastic/x-pack-elasticsearch@023230fa9e
This commit is contained in:
Jason Tedor 2017-07-20 22:42:21 +09:00 committed by GitHub
parent 814c1a21f9
commit 3f08fad603
7 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/bin/x-pack/certgen
View File

@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then
unset JAVA_TOOL_OPTIONS unset JAVA_TOOL_OPTIONS
fi fi
# CONF_FILE setting was removed
if [ ! -z "$CONF_FILE" ]; then
echo "CONF_FILE setting is no longer supported. elasticsearch.yml must be placed in the config directory and cannot be renamed."
exit 1
fi
declare -a args=("$@") declare -a args=("$@")
if [ -e "$CONF_DIR" ]; then if [ -e "$CONF_DIR" ]; then

6
plugin/bin/x-pack/croneval
View File

@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then
unset JAVA_TOOL_OPTIONS unset JAVA_TOOL_OPTIONS
fi fi
# CONF_FILE setting was removed
if [ ! -z "$CONF_FILE" ]; then
echo "CONF_FILE setting is no longer supported. elasticsearch.yml must be placed in the config directory and cannot be renamed."
exit 1
fi
declare -a args=("$@") declare -a args=("$@")
if [ -e "$CONF_DIR" ]; then if [ -e "$CONF_DIR" ]; then

6
plugin/bin/x-pack/extension
View File

@ -56,12 +56,6 @@ fi
# include x-pack jars in classpath # include x-pack jars in classpath
ES_CLASSPATH="$ES_CLASSPATH:$ES_HOME/plugins/x-pack/*" ES_CLASSPATH="$ES_CLASSPATH:$ES_HOME/plugins/x-pack/*"
# CONF_FILE setting was removed
if [ ! -z "$CONF_FILE" ]; then
echo "CONF_FILE setting is no longer supported. elasticsearch.yml must be placed in the config directory and cannot be renamed."
exit 1
fi
declare -a args=("$@") declare -a args=("$@")
if [ -e "$CONF_DIR" ]; then if [ -e "$CONF_DIR" ]; then

6
plugin/bin/x-pack/migrate
View File

@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then
unset JAVA_TOOL_OPTIONS unset JAVA_TOOL_OPTIONS
fi fi
# CONF_FILE setting was removed
if [ ! -z "$CONF_FILE" ]; then
echo "CONF_FILE setting is no longer supported. elasticsearch.yml must be placed in the config directory and cannot be renamed."
exit 1
fi
declare -a args=("$@") declare -a args=("$@")
if [ -e "$CONF_DIR" ]; then if [ -e "$CONF_DIR" ]; then

6
plugin/bin/x-pack/setup-passwords
View File

@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then
unset JAVA_TOOL_OPTIONS unset JAVA_TOOL_OPTIONS
fi fi
# CONF_FILE setting was removed
if [ ! -z "$CONF_FILE" ]; then
echo "CONF_FILE setting is no longer supported. elasticsearch.yml must be placed in the config directory and cannot be renamed."
exit 1
fi
declare -a args=("$@") declare -a args=("$@")
if [ -e "$CONF_DIR" ]; then if [ -e "$CONF_DIR" ]; then

6
plugin/bin/x-pack/syskeygen
View File

@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then
unset JAVA_TOOL_OPTIONS unset JAVA_TOOL_OPTIONS
fi fi
# CONF_FILE setting was removed
if [ ! -z "$CONF_FILE" ]; then
echo "CONF_FILE setting is no longer supported. elasticsearch.yml must be placed in the config directory and cannot be renamed."
exit 1
fi
declare -a args=("$@") declare -a args=("$@")
if [ -e "$CONF_DIR" ]; then if [ -e "$CONF_DIR" ]; then

6
plugin/bin/x-pack/users
View File

@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then
unset JAVA_TOOL_OPTIONS unset JAVA_TOOL_OPTIONS
fi fi
# CONF_FILE setting was removed
if [ ! -z "$CONF_FILE" ]; then
echo "CONF_FILE setting is no longer supported. elasticsearch.yml must be placed in the config directory and cannot be renamed."
exit 1
fi
declare -a args=("$@") declare -a args=("$@")
if [ -e "$CONF_DIR" ]; then if [ -e "$CONF_DIR" ]; then