diff options
| -rw-r--r-- | README.md | 10 | ||||
| -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 | ||||
| -rw-r--r-- | dist/vespa.spec | 8 | ||||
| -rwxr-xr-x | docker/run-vespa-internal.sh | 8 | ||||
| -rw-r--r-- | vespamalloc/src/vespamalloc/malloc/memorywatcher.h | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/README.md b/README.md index d8a705cb1a0..8c2e915a93b 100644 --- a/README.md +++ b/README.md @@ -41,12 +41,12 @@ Java modules can be built on any environment having Java and Maven: sh bootstrap.sh full mkdir <builddir> cd <builddir> - cmake3 -DCMAKE_INSTALL_PREFIX=/opt/yahoo/vespa \ + cmake3 -DCMAKE_INSTALL_PREFIX=/opt/vespa \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ - -DEXTRA_LINK_DIRECTORY="/opt/yahoo/vespa-boost/lib;/opt/yahoo/vespa-libtorrent/lib;/opt/yahoo/vespa-zookeeper-c-client/lib;/opt/yahoo/vespa-cppunit/lib;/usr/lib64/llvm3.9/lib" \ - -DEXTRA_INCLUDE_DIRECTORY="/opt/yahoo/vespa-boost/include;/opt/yahoo/vespa-libtorrent/include;/opt/yahoo/vespa-zookeeper-c-client/include;/opt/yahoo/vespa-cppunit/include;/usr/include/llvm3.9" \ - -DCMAKE_INSTALL_RPATH="/opt/yahoo/vespa/lib64;/opt/yahoo/vespa-boost/lib;/opt/yahoo/vespa-libtorrent/lib;/opt/yahoo/vespa-zookeeper-c-client/lib;/opt/yahoo/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/include/llvm3.9" \ - -DCMAKE_BUILD_RPATH=/opt/yahoo/vespa/lib64 \ + -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm3.9/lib" \ + -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include;/usr/include/llvm3.9" \ + -DCMAKE_INSTALL_RPATH="/opt/vespa/lib64;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/include/llvm3.9" \ + -DCMAKE_BUILD_RPATH=/opt/vespa/lib64 \ <sourcedir> make make test 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; diff --git a/dist/vespa.spec b/dist/vespa.spec index 2dabda9fc60..b97662a3df5 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -3,7 +3,7 @@ %define __jar_repack %{nil} # Force special prefix for Vespa -%define _prefix /opt/yahoo/vespa +%define _prefix /opt/vespa Name: vespa Version: VESPA_VERSION @@ -66,9 +66,9 @@ sh bootstrap.sh mvn install -DskipTests -Dmaven.javadoc.skip=true cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ - -DEXTRA_LINK_DIRECTORY="/usr/lib64/llvm3.9/lib;/opt/yahoo/vespa-boost/lib;/opt/yahoo/vespa-libtorrent/lib;/opt/yahoo/vespa-zookeeper-c-client/lib;/opt/yahoo/vespa-cppunit/lib" \ - -DEXTRA_INCLUDE_DIRECTORY="/usr/include/llvm3.9;/opt/yahoo/vespa-boost/include;/opt/yahoo/vespa-libtorrent/include;/opt/yahoo/vespa-zookeeper-c-client/include;/opt/yahoo/vespa-cppunit/include" \ - -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64;/opt/yahoo/vespa-boost/lib;/opt/yahoo/vespa-libtorrent/lib;/opt/yahoo/vespa-zookeeper-c-client/lib;/opt/yahoo/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server" \ + -DEXTRA_LINK_DIRECTORY="/usr/lib64/llvm3.9/lib;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib" \ + -DEXTRA_INCLUDE_DIRECTORY="/usr/include/llvm3.9;/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include" \ + -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server" \ -DCMAKE_BUILD_RPATH=%{_prefix}/lib64 \ . diff --git a/docker/run-vespa-internal.sh b/docker/run-vespa-internal.sh index 63029894936..dbfc9cc9777 100755 --- a/docker/run-vespa-internal.sh +++ b/docker/run-vespa-internal.sh @@ -15,15 +15,15 @@ VESPA_VERSION=$1 rpm -i "vespa*-${VESPA_VERSION}-*.rpm" # Workaround until we figure out why rpm does not set the ownership. -chown -R vespa:vespa /opt/yahoo/vespa +chown -R vespa:vespa /opt/vespa export VESPA_CONFIG_SERVERS=$(hostname) -/opt/yahoo/vespa/bin/vespa-start-configserver -/opt/yahoo/vespa/bin/vespa-start-services +/opt/vespa/bin/vespa-start-configserver +/opt/vespa/bin/vespa-start-services # Print log forever while true; do - /opt/yahoo/vespa/bin/logfmt -f /opt/yahoo/vespa/logs/vespa/vespa.log + /opt/vespa/bin/logfmt -f /opt/vespa/logs/vespa/vespa.log sleep 10 done diff --git a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h index aceef34ed09..27c3bc8c337 100644 --- a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h +++ b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h @@ -226,7 +226,7 @@ namespace { const char *vespaHomeConf(char pathName[]) { - const char *home = "/opt/yahoo/vespa"; + const char *home = "/opt/vespa"; const char *env = getenv("VESPA_HOME"); if (env != NULL) { home = env; |