diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-10-19 13:54:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 13:54:07 +0200 |
| commit | ba70ab7b16f9518b90846e251822e6e11a46d541 (patch) | |
| tree | c8f676845d7dc2bdf19af7aef3b3dbbd88a2630b | |
| parent | dbf6dbe83dbafc12977a0823034c5a41d6116c5c (diff) | |
Revert "Move config server defs and make sure VESPA_USER owns var/."
| -rw-r--r-- | functions.cmake | 4 | ||||
| -rwxr-xr-x | vespabase/src/rhel-prestart.sh | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/functions.cmake b/functions.cmake index f3d28bb1a0f..1c3d1ff7a6e 100644 --- a/functions.cmake +++ b/functions.cmake @@ -539,9 +539,9 @@ endfunction() function(install_config_definition) if(ARGC GREATER 1) - install(FILES ${ARGV0} RENAME ${ARGV1} DESTINATION share/vespa/configdefinitions) + install(FILES ${ARGV0} RENAME ${ARGV1} DESTINATION var/db/vespa/config_server/serverdb/classes) else() - install(FILES ${ARGV0} DESTINATION share/vespa/configdefinitions) + install(FILES ${ARGV0} DESTINATION var/db/vespa/config_server/serverdb/classes) endif() endfunction() diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index 89be9fec2be..37fc5e98533 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -84,7 +84,6 @@ fixdir root wheel 1777 var/run fixdir ${VESPA_USER} wheel 1777 var/crash fixdir ${VESPA_USER} wheel 1777 logs/vespa fixdir ${VESPA_USER} wheel 1777 tmp/vespa -fixdir ${VESPA_USER} wheel 755 var fixdir ${VESPA_USER} wheel 755 libexec/vespa/plugins/qrs fixdir ${VESPA_USER} wheel 755 logs/vespa/configserver fixdir ${VESPA_USER} wheel 755 logs/vespa/qrs |