From 3f08fad603d9cd30831b35aa4dd761a3fccebc6e Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Thu, 20 Jul 2017 22:42:21 +0900 Subject: [PATCH] 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@023230fa9e299d5c54c15f852f27ffc4a438ae75 --- plugin/bin/x-pack/certgen | 6 ------ plugin/bin/x-pack/croneval | 6 ------ plugin/bin/x-pack/extension | 6 ------ plugin/bin/x-pack/migrate | 6 ------ plugin/bin/x-pack/setup-passwords | 6 ------ plugin/bin/x-pack/syskeygen | 6 ------ plugin/bin/x-pack/users | 6 ------ 7 files changed, 42 deletions(-) diff --git a/plugin/bin/x-pack/certgen b/plugin/bin/x-pack/certgen index 13647a75a76..44dd405713a 100644 --- a/plugin/bin/x-pack/certgen +++ b/plugin/bin/x-pack/certgen @@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then unset JAVA_TOOL_OPTIONS 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=("$@") if [ -e "$CONF_DIR" ]; then diff --git a/plugin/bin/x-pack/croneval b/plugin/bin/x-pack/croneval index 8b75e9315e6..3aac27dc75d 100755 --- a/plugin/bin/x-pack/croneval +++ b/plugin/bin/x-pack/croneval @@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then unset JAVA_TOOL_OPTIONS 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=("$@") if [ -e "$CONF_DIR" ]; then diff --git a/plugin/bin/x-pack/extension b/plugin/bin/x-pack/extension index 86c5a57090f..b2154191bbc 100755 --- a/plugin/bin/x-pack/extension +++ b/plugin/bin/x-pack/extension @@ -56,12 +56,6 @@ fi # include x-pack jars in classpath 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=("$@") if [ -e "$CONF_DIR" ]; then diff --git a/plugin/bin/x-pack/migrate b/plugin/bin/x-pack/migrate index 11e679709d7..c559b9ab734 100755 --- a/plugin/bin/x-pack/migrate +++ b/plugin/bin/x-pack/migrate @@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then unset JAVA_TOOL_OPTIONS 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=("$@") if [ -e "$CONF_DIR" ]; then diff --git a/plugin/bin/x-pack/setup-passwords b/plugin/bin/x-pack/setup-passwords index ca66a77ec95..193ed9908a8 100644 --- a/plugin/bin/x-pack/setup-passwords +++ b/plugin/bin/x-pack/setup-passwords @@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then unset JAVA_TOOL_OPTIONS 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=("$@") if [ -e "$CONF_DIR" ]; then diff --git a/plugin/bin/x-pack/syskeygen b/plugin/bin/x-pack/syskeygen index 8ba4553472c..85b1075d7ea 100755 --- a/plugin/bin/x-pack/syskeygen +++ b/plugin/bin/x-pack/syskeygen @@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then unset JAVA_TOOL_OPTIONS 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=("$@") if [ -e "$CONF_DIR" ]; then diff --git a/plugin/bin/x-pack/users b/plugin/bin/x-pack/users index d9d2d498200..a6b4bc71251 100755 --- a/plugin/bin/x-pack/users +++ b/plugin/bin/x-pack/users @@ -66,12 +66,6 @@ if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then unset JAVA_TOOL_OPTIONS 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=("$@") if [ -e "$CONF_DIR" ]; then