diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2016-09-14 23:09:24 +0200 |
|---|---|---|
| committer | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-09-14 23:09:24 +0200 |
| commit | 40a0c95e607ed054d3fca3c2d8ca95b134a78634 (patch) | |
| tree | 870e971dc46f3b030beb9fc15661e9384be7f398 /defaults | |
| parent | 7aac55e577fb431b0ac3cf461fff770b63b0d51d (diff) | |
/opt/vespa -> /opt/yahoo/vespa (#648)
Diffstat (limited to 'defaults')
| -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 |
3 files changed, 4 insertions, 4 deletions
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 bbca3c3aa34..060fd3c56cd 100644 --- a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java +++ b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java @@ -29,8 +29,8 @@ public class Defaults { private String findVespaHome() { Optional<String> vespaHomeEnv = Optional.ofNullable(System.getenv("VESPA_HOME")); if ( ! vespaHomeEnv.isPresent() || vespaHomeEnv.get().trim().isEmpty()) { - log.info("VESPA_HOME not set, using /opt/vespa/"); - return "/opt/vespa/"; + log.info("VESPA_HOME not set, using /opt/yahoo/vespa/"); + return "/opt/yahoo/vespa/"; } String vespaHome = vespaHomeEnv.get(); if ( ! vespaHome.endsWith("/")) 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 28cdc4e699d..ef64b6a252a 100644 --- a/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java +++ b/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java @@ -12,7 +12,7 @@ public class DefaultsTestCase { @Test public void testUnderVespaHome() { - assertEquals("/opt/vespa/my/relative/path", Defaults.getDefaults().underVespaHome("my/relative/path")); + assertEquals("/opt/yahoo/vespa/my/relative/path", Defaults.getDefaults().underVespaHome("my/relative/path")); assertEquals("/my/absolute/path", Defaults.getDefaults().underVespaHome("/my/absolute/path")); assertEquals("./my/explicit/relative/path", Defaults.getDefaults().underVespaHome("./my/explicit/relative/path")); } diff --git a/defaults/src/vespa/defaults.cpp b/defaults/src/vespa/defaults.cpp index 5c2547b730e..74fc36f1859 100644 --- a/defaults/src/vespa/defaults.cpp +++ b/defaults/src/vespa/defaults.cpp @@ -12,7 +12,7 @@ namespace { -const char *defaultHome = "/opt/vespa/"; +const char *defaultHome = "/opt/yahoo/vespa/"; char computedHome[PATH_MAX]; int defaultWebServicePort = 8080; int defaultPortBase = 19000; |