diff options
6 files changed, 7 insertions, 6 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index f1565d1fa4b..97322fc1c55 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -111,7 +111,7 @@ public class FilesApplicationPackage implements ApplicationPackage { /** * New package from given path on local file system. Retrieves config definition files from - * the default location 'serverdb/classes'. + * the default location '$VESPA_HOME/share/vespa/configdefinitions'. * * @param appDir application package directory * @param preprocessedDir preprocessed application package output directory diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java index 325f89ea07b..7640a20d09c 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java @@ -29,7 +29,7 @@ public class StaticConfigDefinitionRepo implements ConfigDefinitionRepo { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(StaticConfigDefinitionRepo.class.getName()); private final Map<ConfigDefinitionKey, ConfigDefinition> configDefinitions = new LinkedHashMap<>(); - private static final String DEFAULT_SERVER_DEF_DIR = Defaults.getDefaults().underVespaHome("var/db/vespa/config_server/serverdb/classes"); + private static final String DEFAULT_SERVER_DEF_DIR = Defaults.getDefaults().underVespaHome("share/vespa/configdefinitions"); public StaticConfigDefinitionRepo() { this(new File(DEFAULT_SERVER_DEF_DIR)); diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java index 3d5c9b1c187..c89544fc4b8 100644 --- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java @@ -367,7 +367,7 @@ public class ApplicationDeployTest { /** * Tests that config definitions with namespace are treated properly when they have the format - * as in the config definitions dir ($VESPA_HOME/var/db/vespa/config_server/serverdb/classes on a machine + * as in the config definitions dir ($VESPA_HOME/share/vespa/configdefinitions on a machine * with Vespa packages installed) (does not test when read from user def files). Also tests a config * definition without version in file name */ diff --git a/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java b/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java index 0944569a413..cac6cd0fed0 100644 --- a/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java +++ b/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java @@ -302,7 +302,7 @@ public class ConfigUtils { /** * Creates a ConfigDefinitionKey based on a string with namespace, name and version - * (e.g. Vespa's own config definitions in $VESPA_HOME/var/db/vespa/configserver/serverdb/classes) + * (e.g. Vespa's own config definitions in $VESPA_HOME/share/vespa/configdefinitions) * * @param input A string consisting of "namespace.name.version" * @return a ConfigDefinitionKey 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 |