diff options
Diffstat (limited to 'vespabase')
| -rw-r--r-- | vespabase/conf/services.conf | 6 | ||||
| -rwxr-xr-x | vespabase/src/common-env.sh | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/vespabase/conf/services.conf b/vespabase/conf/services.conf deleted file mode 100644 index dd0988e185a..00000000000 --- a/vespabase/conf/services.conf +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cat <<END -config_protocol_version_override ${services__config_protocol_version_override:-} -addr_configserver ${services__addr_configserver:-} -port_configserver_rpc ${services__port_configserver_rpc:-} -END diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index 011140b4633..efdfa261509 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -64,10 +64,8 @@ get_var() { ret_val=$2 env_var_name=`echo $arg | tr '[:lower:]' '[:upper:]'` - prefixed_var_name1=services__${arg} if varhasvalue $env_var_name ; then eval "ret_val=\${$env_var_name}" - elif varhasvalue $prefixed_var_name1 ; then eval "ret_val=\${$prefixed_var_name1}" fi echo "$ret_val" } |