diff options
author | Geir Storli <geirstorli@yahoo.no> | 2017-07-07 13:25:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-07 13:25:46 +0200 |
commit | 5c8d3c71d4117a7636abd6e59e1a7c59a65bfdb6 (patch) | |
tree | 38d059c7bcd1bc4b5b67bddb22a7bec3d2bb6bec /vespabase | |
parent | 44d576226a5269d91631952e79b561175ec8d1f0 (diff) | |
parent | 46009a8f3dc5a6df8a18be45417e5a37b42f7b98 (diff) |
Merge pull request #2927 from yahoo/toregge/remove-vespa-user-fallback-setting
Remove fallback setting of VESPA_USER, it should already be set from
Diffstat (limited to 'vespabase')
-rwxr-xr-x | vespabase/src/common-env.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index 39107ae5500..dee3b1c785d 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -77,6 +77,7 @@ get_var() { populate_environment () { # these are the variables we want while running vespa: # VESPA_HOME - where is Vespa installed + # VESPA_USER - The user running the vespa programs # VESPA_CONFIGSERVERS - the host (or list of host) where a configserver runs # VESPA_CONFIG_SOURCES - possible override as the first place to get config @@ -100,11 +101,6 @@ populate_environment () { read_conf_file consider_fallback ROOT ${VESPA_HOME%/} - if id yahoo >/dev/null 2>&1 ; then - consider_fallback VESPA_USER "yahoo" - elif id vespa >/dev/null 2>&1 ; then - consider_fallback VESPA_USER "vespa" - fi } populate_environment |