diff options
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 97a58fc8440..4d228485fbc 100644 --- a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java +++ b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java @@ -31,8 +31,8 @@ public class Defaults { static 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/yahoo/vespa/"); - return "/opt/yahoo/vespa/"; + log.info("VESPA_HOME not set, using /opt/vespa/"); + return "/opt/vespa/"; } String vespaHome = vespaHomeEnv.get().trim(); 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 99a8421ae54..4a6215c4d72 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/yahoo/vespa/my/relative/path", Defaults.getDefaults().underVespaHome("my/relative/path")); + assertEquals("/opt/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 9e59fe15802..4cc2397ba8d 100644 --- a/defaults/src/vespa/defaults.cpp +++ b/defaults/src/vespa/defaults.cpp @@ -13,7 +13,7 @@ namespace { -const char *defaultHome = "/opt/yahoo/vespa/"; +const char *defaultHome = "/opt/vespa/"; char computedHome[PATH_MAX]; const char *defaultUser = "yahoo"; int defaultWebServicePort = 8080; |