Reduce need to rename config definition files in post install step.

1 files changed, 32 insertions, 32 deletions

diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt
index 0a722df5475..016739f4594 100644
--- a/configdefinitions/src/vespa/CMakeLists.txt
+++ b/configdefinitions/src/vespa/CMakeLists.txt
@@ -5,66 +5,66 @@ vespa_add_library(configdefinitions
     DEPENDS
 )
 vespa_generate_config(configdefinitions application-id.def)
-install(FILES application-id.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES application-id.def RENAME cloud.config.application-id.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions attributes.def)
-install(FILES attributes.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES attributes.def RENAME vespa.config.search.attributes.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions cluster-info.def)
-install(FILES cluster-info.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES cluster-info.def RENAME cloud.config.cluster-info.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions cluster-list.def)
-install(FILES cluster-list.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES cluster-list.def RENAME cloud.config.cluster-list.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions configserver.def)
-install(FILES configserver.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES configserver.def RENAME cloud.config.configserver.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions dispatch.def)
-install(FILES dispatch.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES dispatch.def RENAME vespa.config.search.dispatch.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions fleetcontroller.def)
-install(FILES fleetcontroller.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES fleetcontroller.def RENAME vespa.config.content.fleetcontroller.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions ilscripts.def)
-install(FILES ilscripts.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES ilscripts.def RENAME vespa.configdefinition.ilscripts.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions imported-fields.def)
-install(FILES imported-fields.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES imported-fields.def RENAME vespa.config.search.imported-fields.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions indexschema.def)
-install(FILES indexschema.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES indexschema.def RENAME vespa.config.search.indexschema.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions lb-services.def)
-install(FILES lb-services.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES lb-services.def RENAME cloud.config.lb-services.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions load-type.def)
-install(FILES load-type.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES load-type.def RENAME vespa.config.content.load-type.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions messagetyperouteselectorpolicy.def)
-install(FILES messagetyperouteselectorpolicy.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES messagetyperouteselectorpolicy.def RENAME vespa.config.content.messagetyperouteselectorpolicy.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions model.def)
-install(FILES model.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES model.def RENAME cloud.config.model.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions orchestrator.def)
-install(FILES orchestrator.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES orchestrator.def RENAME vespa.orchestrator.config.orchestrator.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions persistence.def)
-install(FILES persistence.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES persistence.def RENAME vespa.config.content.persistence.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions rank-profiles.def)
-install(FILES rank-profiles.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES rank-profiles.def RENAME vespa.config.search.rank-profiles.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions routing.def)
-install(FILES routing.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES routing.def RENAME cloud.config.routing.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions routing-provider.def)
-install(FILES routing-provider.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES routing-provider.def RENAME cloud.config.routing-provider.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions sentinel.def)
-install(FILES sentinel.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES sentinel.def RENAME cloud.config.sentinel.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions slobroks.def)
-install(FILES slobroks.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES slobroks.def RENAME cloud.config.slobroks.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions specialtokens.def)
-install(FILES specialtokens.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES specialtokens.def RENAME vespa.configdefinition.specialtokens.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions stor-devices.def)
-install(FILES stor-devices.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES stor-devices.def RENAME vespa.config.storage.stor-devices.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions stor-distribution.def)
-install(FILES stor-distribution.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES stor-distribution.def RENAME vespa.config.content.stor-distribution.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions stor-filestor.def)
-install(FILES stor-filestor.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES stor-filestor.def RENAME vespa.config.content.stor-filestor.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions stor-memfilepersistence.def)
-install(FILES stor-memfilepersistence.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES stor-memfilepersistence.def RENAME vespa.config.storage.stor-memfilepersistence.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions summary.def)
-install(FILES summary.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES summary.def RENAME vespa.config.search.summary.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions summarymap.def)
-install(FILES summarymap.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES summarymap.def RENAME vespa.config.search.summarymap.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions upgrading.def)
-install(FILES upgrading.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES upgrading.def RENAME vespa.config.content.upgrading.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions ymon.def)
-install(FILES ymon.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES ymon.def RENAME cloud.config.ymon.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions zookeeper-server.def)
-install(FILES zookeeper-server.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES zookeeper-server.def RENAME cloud.config.zookeeper-server.def DESTINATION var/db/vespa/config_server/serverdb/classes)
 vespa_generate_config(configdefinitions zookeepers.def)
-install(FILES zookeepers.def DESTINATION var/db/vespa/config_server/serverdb/classes)
+install(FILES zookeepers.def RENAME cloud.config.zookeepers.def DESTINATION var/db/vespa/config_server/serverdb/classes)