diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-10-19 13:14:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 13:14:44 +0200 |
| commit | dbf6dbe83dbafc12977a0823034c5a41d6116c5c (patch) | |
| tree | 971c6117421ef4c57c27d4646413bab893169627 | |
| parent | 1ebf34b784ce3f874210cf11eaffd95a24020d0e (diff) | |
| parent | d58f6e59f4b3d61ae2c37cd96410da63401c0160 (diff) | |
Merge pull request #3820 from vespa-engine/aressem/move-config-server-defs
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, 3 insertions, 2 deletions
diff --git a/functions.cmake b/functions.cmake index 1c3d1ff7a6e..f3d28bb1a0f 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 var/db/vespa/config_server/serverdb/classes) + install(FILES ${ARGV0} RENAME ${ARGV1} DESTINATION share/vespa/configdefinitions) else() - install(FILES ${ARGV0} DESTINATION var/db/vespa/config_server/serverdb/classes) + install(FILES ${ARGV0} DESTINATION share/vespa/configdefinitions) endif() endfunction() diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index 37fc5e98533..89be9fec2be 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -84,6 +84,7 @@ 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 |