diff options
15 files changed, 65 insertions, 65 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) diff --git a/document/src/vespa/document/config/CMakeLists.txt b/document/src/vespa/document/config/CMakeLists.txt index af9f4672fe3..32bbce210a5 100644 --- a/document/src/vespa/document/config/CMakeLists.txt +++ b/document/src/vespa/document/config/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_library(document_documentconfig OBJECT DEPENDS ) vespa_generate_config(document_documentconfig documenttypes.def) -install(FILES - documenttypes.def - documentmanager.def +install(FILES documenttypes.def RENAME document.documenttypes.def + DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES documentmanager.def RENAME document.config.documentmanager.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt b/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt index 14966f28e66..143310d1f67 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt +++ b/documentapi/src/vespa/documentapi/messagebus/policies/CMakeLists.txt @@ -20,4 +20,4 @@ vespa_add_library(documentapi_documentapipolicies OBJECT DEPENDS ) vespa_generate_config(documentapi_documentapipolicies ../../../../main/resources/configdefinitions/documentrouteselectorpolicy.def) -install(FILES ../../../../main/resources/configdefinitions/documentrouteselectorpolicy.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES ../../../../main/resources/configdefinitions/documentrouteselectorpolicy.def RENAME documentapi.messagebus.protocol.documentrouteselectorpolicy.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/filedistribution/src/vespa/filedistribution/distributor/CMakeLists.txt b/filedistribution/src/vespa/filedistribution/distributor/CMakeLists.txt index d916b68121a..5345cba1e3f 100644 --- a/filedistribution/src/vespa/filedistribution/distributor/CMakeLists.txt +++ b/filedistribution/src/vespa/filedistribution/distributor/CMakeLists.txt @@ -12,4 +12,4 @@ vespa_add_library(filedistribution_distributor STATIC ) target_compile_options(filedistribution_distributor PRIVATE -DTORRENT_DISABLE_ENCRYPTION -DTORRENT_DISABLE_DHT -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED) vespa_generate_config(filedistribution_distributor filedistributor.def) -install(FILES filedistributor.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES filedistributor.def RENAME cloud.config.filedistribution.filedistributor.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/filedistribution/src/vespa/filedistribution/model/CMakeLists.txt b/filedistribution/src/vespa/filedistribution/model/CMakeLists.txt index f745057e3a3..7136aba475b 100644 --- a/filedistribution/src/vespa/filedistribution/model/CMakeLists.txt +++ b/filedistribution/src/vespa/filedistribution/model/CMakeLists.txt @@ -17,4 +17,4 @@ vespa_add_library(filedistribution_filedistributionmodel STATIC vespa_generate_config(filedistribution_filedistributionmodel filereferences.def) vespa_add_target_external_dependency(filedistribution_filedistributionmodel zookeeper_mt) -install(FILES filereferences.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES filereferences.def RENAME cloud.config.filedistribution.filereferences.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/logd/src/logd/CMakeLists.txt b/logd/src/logd/CMakeLists.txt index 6b46ef50b92..03ade1d66c8 100644 --- a/logd/src/logd/CMakeLists.txt +++ b/logd/src/logd/CMakeLists.txt @@ -12,4 +12,4 @@ vespa_add_library(logd STATIC DEPENDS ) vespa_generate_config(logd ../main/resources/configdefinitions/logd.def) -install(FILES ../main/resources/configdefinitions/logd.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES ../main/resources/configdefinitions/logd.def RENAME cloud.config.log.logd.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/messagebus/src/vespa/messagebus/CMakeLists.txt b/messagebus/src/vespa/messagebus/CMakeLists.txt index 7b714b88033..7c922f36a8c 100644 --- a/messagebus/src/vespa/messagebus/CMakeLists.txt +++ b/messagebus/src/vespa/messagebus/CMakeLists.txt @@ -37,4 +37,4 @@ vespa_add_library(messagebus DEPENDS ) vespa_generate_config(messagebus ../../main/config/messagebus.def) -install(FILES ../../main/config/messagebus.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES ../../main/config/messagebus.def RENAME messagebus.messagebus.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/metrics/src/vespa/metrics/CMakeLists.txt b/metrics/src/vespa/metrics/CMakeLists.txt index 4e7558fcfde..27a1f25e887 100644 --- a/metrics/src/vespa/metrics/CMakeLists.txt +++ b/metrics/src/vespa/metrics/CMakeLists.txt @@ -24,4 +24,4 @@ vespa_add_library(metrics DEPENDS ) vespa_generate_config(metrics metricsmanager.def) -install(FILES metricsmanager.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES metricsmanager.def RENAME metrics.metricsmanager.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/searchcore/src/vespa/searchcore/config/CMakeLists.txt b/searchcore/src/vespa/searchcore/config/CMakeLists.txt index 416019a8344..c7669efc876 100644 --- a/searchcore/src/vespa/searchcore/config/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/config/CMakeLists.txt @@ -4,11 +4,11 @@ vespa_add_library(searchcore_fconfig STATIC DEPENDS ) vespa_generate_config(searchcore_fconfig partitions.def) -install(FILES partitions.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES partitions.def RENAME vespa.config.search.core.partitions.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(searchcore_fconfig fdispatchrc.def) -install(FILES fdispatchrc.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES fdispatchrc.def RENAME vespa.config.search.core.fdispatchrc.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(searchcore_fconfig proton.def) -install(FILES proton.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES proton.def RENAME vespa.config.search.core.proton.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(searchcore_fconfig ranking-constants.def) -install(FILES ranking-constants.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES ranking-constants.def RENAME vespa.config.search.core.ranking-constants.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(searchcore_fconfig hwinfo.def) diff --git a/searchlib/src/vespa/searchlib/config/CMakeLists.txt b/searchlib/src/vespa/searchlib/config/CMakeLists.txt index da78c4c74ad..2f34d228f60 100644 --- a/searchlib/src/vespa/searchlib/config/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/config/CMakeLists.txt @@ -4,4 +4,4 @@ vespa_add_library(searchlib_sconfig OBJECT DEPENDS ) vespa_generate_config(searchlib_sconfig translogserver.def) -install(FILES translogserver.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES translogserver.def RENAME searchlib.translogserver.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt b/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt index 4d14cfd9fdf..7f6dc5c4cdd 100644 --- a/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt +++ b/searchsummary/src/vespa/searchsummary/config/CMakeLists.txt @@ -4,4 +4,4 @@ vespa_add_library(searchsummary_config OBJECT DEPENDS ) vespa_generate_config(searchsummary_config juniperrc.def) -install(FILES juniperrc.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES juniperrc.def RENAME vespa.config.search.summary.juniperrc.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/storage/src/vespa/storage/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/bucketdb/CMakeLists.txt index 3f0a27a5bb4..5c818631d54 100644 --- a/storage/src/vespa/storage/bucketdb/CMakeLists.txt +++ b/storage/src/vespa/storage/bucketdb/CMakeLists.txt @@ -17,6 +17,6 @@ vespa_add_library(storage_bucketdb OBJECT storage_storageconfig ) vespa_generate_config(storage_bucketdb stor-bucketdb.def) -install(FILES stor-bucketdb.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-bucketdb.def RENAME vespa.config.content.core.stor-bucketdb.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_bucketdb stor-bucket-init.def) -install(FILES stor-bucket-init.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-bucket-init.def RENAME vespa.config.content.core.stor-bucket-init.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/storage/src/vespa/storage/config/CMakeLists.txt b/storage/src/vespa/storage/config/CMakeLists.txt index 9b7af8c6024..0f3f392f324 100644 --- a/storage/src/vespa/storage/config/CMakeLists.txt +++ b/storage/src/vespa/storage/config/CMakeLists.txt @@ -5,26 +5,26 @@ vespa_add_library(storage_storageconfig OBJECT DEPENDS ) vespa_generate_config(storage_storageconfig stor-communicationmanager.def) -install(FILES stor-communicationmanager.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-communicationmanager.def RENAME vespa.config.content.core.stor-communicationmanager.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_storageconfig stor-distributormanager.def) -install(FILES stor-distributormanager.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-distributormanager.def RENAME vespa.config.content.core.stor-distributormanager.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_storageconfig stor-server.def) -install(FILES stor-server.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-server.def RENAME vespa.config.content.core.stor-server.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_storageconfig stor-status.def) -install(FILES stor-status.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-status.def RENAME vespa.config.content.core.stor-status.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_storageconfig stor-messageforwarder.def) -install(FILES stor-messageforwarder.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-messageforwarder.def RENAME vespa.config.content.core.stor-messageforwarder.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_storageconfig stor-opslogger.def) -install(FILES stor-opslogger.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-opslogger.def RENAME vespa.config.content.core.stor-opslogger.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_storageconfig stor-visitordispatcher.def) -install(FILES stor-visitordispatcher.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-visitordispatcher.def RENAME vespa.config.content.core.stor-visitordispatcher.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_storageconfig stor-integritychecker.def) -install(FILES stor-integritychecker.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-integritychecker.def RENAME vespa.config.content.core.stor-integritychecker.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_storageconfig stor-bucketmover.def) -install(FILES stor-bucketmover.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-bucketmover.def RENAME vespa.config.content.core.stor-bucketmover.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_storageconfig stor-bouncer.def) -install(FILES stor-bouncer.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-bouncer.def RENAME vespa.config.content.core.stor-bouncer.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_storageconfig stor-prioritymapping.def) -install(FILES stor-prioritymapping.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-prioritymapping.def RENAME vespa.config.content.core.stor-prioritymapping.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(storage_storageconfig rpc-provider.def) -install(FILES rpc-provider.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES rpc-provider.def RENAME vespa.config.content.core.rpc-provider.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/storage/src/vespa/storage/visiting/CMakeLists.txt b/storage/src/vespa/storage/visiting/CMakeLists.txt index 9bd18510859..ee10bbd58ab 100644 --- a/storage/src/vespa/storage/visiting/CMakeLists.txt +++ b/storage/src/vespa/storage/visiting/CMakeLists.txt @@ -17,4 +17,4 @@ vespa_add_library(storage_visitor OBJECT storage_storageconfig ) vespa_generate_config(storage_visitor stor-visitor.def) -install(FILES stor-visitor.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES stor-visitor.def RENAME vespa.config.content.core.stor-visitor.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/vsm/src/vespa/vsm/config/CMakeLists.txt b/vsm/src/vespa/vsm/config/CMakeLists.txt index 43c8fe0218b..ea65d8c8fb4 100644 --- a/vsm/src/vespa/vsm/config/CMakeLists.txt +++ b/vsm/src/vespa/vsm/config/CMakeLists.txt @@ -4,8 +4,8 @@ vespa_add_library(vsm_vconfig OBJECT DEPENDS ) vespa_generate_config(vsm_vconfig vsmfields.def) -install(FILES vsmfields.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES vsmfields.def RENAME vespa.config.search.vsm.vsmfields.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(vsm_vconfig vsm.def) -install(FILES vsm.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES vsm.def RENAME vespa.config.search.vsm.vsm.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(vsm_vconfig vsmsummary.def) -install(FILES vsmsummary.def DESTINATION var/db/vespa/config_server/serverdb/classes) +install(FILES vsmsummary.def RENAME vespa.config.search.vsm.vsmsummary.def DESTINATION var/db/vespa/config_server/serverdb/classes) |