diff options
author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-07-06 12:19:54 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-07-06 12:19:54 +0000 |
commit | 875a9207262cdef4e397ea3548f6c18e565dfd9b (patch) | |
tree | 0681e6d3cc80b4c7bf9b39dbec37b4d16b3d71e2 /defaults | |
parent | b4a23b21c3b4d02374ca7f5bbca4194f03a58437 (diff) |
Change default vespa user to vespa.
Diffstat (limited to 'defaults')
-rw-r--r-- | defaults/pom.xml | 2 | ||||
-rw-r--r-- | defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java | 4 | ||||
-rw-r--r-- | defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java | 2 | ||||
-rw-r--r-- | defaults/src/vespa/defaults.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/defaults/pom.xml b/defaults/pom.xml index d213c999acb..2f3f06780e7 100644 --- a/defaults/pom.xml +++ b/defaults/pom.xml @@ -74,7 +74,7 @@ <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile> <environmentVariables> <VESPA_HOME>/opt/vespa</VESPA_HOME> - <VESPA_USER>yahoo</VESPA_USER> + <VESPA_USER>vespa</VESPA_USER> </environmentVariables> </configuration> </plugin> diff --git a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java index 928b8920e3c..d8cf0947ef0 100644 --- a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java +++ b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java @@ -45,8 +45,8 @@ public class Defaults { static private String findVespaUser() { Optional<String> vespaUserEnv = Optional.ofNullable(System.getenv("VESPA_USER")); if (! vespaUserEnv.isPresent()) { - log.fine("VESPA_USER not set, using yahoo"); - return "yahoo"; + log.fine("VESPA_USER not set, using vespa"); + return "vespa"; } return vespaUserEnv.get().trim(); } diff --git a/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java b/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java index bc84ae7a155..75da8e1146f 100644 --- a/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java +++ b/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java @@ -19,7 +19,7 @@ public class DefaultsTestCase { @Test public void testFindVespaUser() { - assertEquals("yahoo", Defaults.getDefaults().vespaUser()); + assertEquals("vespa", Defaults.getDefaults().vespaUser()); } } diff --git a/defaults/src/vespa/defaults.cpp b/defaults/src/vespa/defaults.cpp index 923bc044bdf..730ec4735ca 100644 --- a/defaults/src/vespa/defaults.cpp +++ b/defaults/src/vespa/defaults.cpp @@ -14,7 +14,7 @@ namespace { const char *defaultHome = "/opt/vespa"; -const char *defaultUser = "yahoo"; +const char *defaultUser = "vespa"; int defaultWebServicePort = 8080; int defaultPortBase = 19000; int defaultPortConfigServerRpc = 19070; |