From 09a49f461eea6116a22ff93255dec1a3fe75e40b Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Thu, 11 Jan 2018 14:15:34 +0000 Subject: use generic use "vespa" --- configd/src/apps/su/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configd/src/apps/su/main.cpp b/configd/src/apps/su/main.cpp index c1cebd56c29..ceecc71ae5a 100644 --- a/configd/src/apps/su/main.cpp +++ b/configd/src/apps/su/main.cpp @@ -18,7 +18,7 @@ int main(int argc, char** argv) } const char *username = getenv("VESPA_USER"); if (username == nullptr) { - username = "yahoo"; + username = "vespa"; } struct passwd *p = getpwnam(username); if (p == nullptr) { -- cgit v1.2.3 From b79a87075201e99eaec4bab71b16f9c0424daa85 Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Thu, 11 Jan 2018 14:15:57 +0000 Subject: install jing.jar --- config-model/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config-model/CMakeLists.txt b/config-model/CMakeLists.txt index 274ab8a763b..16c0867e5d6 100644 --- a/config-model/CMakeLists.txt +++ b/config-model/CMakeLists.txt @@ -8,3 +8,5 @@ vespa_install_script(src/main/sh/vespa-validate-application bin) install(DIRECTORY src/main/resources/schema DESTINATION share/vespa PATTERN ".gitignore" EXCLUDE) install(DIRECTORY src/main/resources/schema DESTINATION share/vespa/schema/version/6.x PATTERN ".gitignore" EXCLUDE) + +install_java_artifact(jing) -- cgit v1.2.3 From cb38428e20cec5f793d06e291e64f83d29776708 Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Thu, 11 Jan 2018 14:17:02 +0000 Subject: skip script intalled in vespaclient-java --- vespabase/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index ea007b130f9..2fd8ea2701f 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -5,7 +5,6 @@ vespa_install_script(src/start-cbinaries.sh vespa-config-status bin) vespa_install_script(src/start-cbinaries.sh vespa-doclocator bin) vespa_install_script(src/start-cbinaries.sh vespa-model-inspect bin) vespa_install_script(src/start-cbinaries.sh vespa-proton-cmd bin) -vespa_install_script(src/start-cbinaries.sh vespa-query-profile-dump-tool bin) vespa_install_script(src/start-cbinaries.sh vespa-route bin) vespa_install_script(src/start-cbinaries.sh vespa-transactionlog-inspect bin) vespa_install_script(src/start-cbinaries.sh vespa-vds-disktool bin) -- cgit v1.2.3