From 781f9614ff1353e64935478c717e5d224b862c86 Mon Sep 17 00:00:00 2001 From: Mathieu De Keyzer Date: Sun, 15 Oct 2023 11:58:21 +0200 Subject: [PATCH] ref: search_via_backend => elasticsearch_proxy_api --- EMS/common-bundle/src/DependencyInjection/Configuration.php | 2 +- .../src/DependencyInjection/EMSCommonExtension.php | 2 +- EMS/common-bundle/src/Resources/config/services.xml | 2 +- elasticms-web/config/packages/ems_common.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/EMS/common-bundle/src/DependencyInjection/Configuration.php b/EMS/common-bundle/src/DependencyInjection/Configuration.php index 8de23156d..27e22b5e9 100644 --- a/EMS/common-bundle/src/DependencyInjection/Configuration.php +++ b/EMS/common-bundle/src/DependencyInjection/Configuration.php @@ -31,7 +31,7 @@ public function getConfigTreeBuilder(): TreeBuilder ->scalarNode('backend_url')->defaultValue(null)->end() ->scalarNode('backend_api_key')->defaultValue(null)->end() ->scalarNode('backend_api_verify')->defaultValue(true)->end() - ->scalarNode('search_via_backend')->defaultValue(false)->end() + ->scalarNode('elasticsearch_proxy_api')->defaultValue(false)->end() ->scalarNode('elasticsearch_connection_pool')->defaultValue(null)->end() ->variableNode('elasticsearch_hosts')->defaultValue(self::ELASTICSEARCH_DEFAULT_HOSTS)->end() ->integerNode('log_level')->defaultValue(self::LOG_LEVEL)->end() diff --git a/EMS/common-bundle/src/DependencyInjection/EMSCommonExtension.php b/EMS/common-bundle/src/DependencyInjection/EMSCommonExtension.php index 634377bc5..295e1c05d 100644 --- a/EMS/common-bundle/src/DependencyInjection/EMSCommonExtension.php +++ b/EMS/common-bundle/src/DependencyInjection/EMSCommonExtension.php @@ -41,7 +41,7 @@ public function load(array $configs, ContainerBuilder $container): void $container->setParameter('ems_common.backend_url', $config['backend_url']); $container->setParameter('ems_common.backend_api_key', $config['backend_api_key']); $container->setParameter('ems_common.backend_api_verify', $config['backend_api_verify']); - $container->setParameter('ems_common.search_via_backend', $config['search_via_backend']); + $container->setParameter('ems_common.elasticsearch_proxy_api', $config['elasticsearch_proxy_api']); $container->setParameter('ems_common.elasticsearch_hosts', $config['elasticsearch_hosts']); $container->setParameter('ems_common.elasticsearch_connection_pool', $config['elasticsearch_connection_pool']); $container->setParameter('ems_common.storages', $config['storages']); diff --git a/EMS/common-bundle/src/Resources/config/services.xml b/EMS/common-bundle/src/Resources/config/services.xml index 34fc9a81d..1b8d8f0ec 100644 --- a/EMS/common-bundle/src/Resources/config/services.xml +++ b/EMS/common-bundle/src/Resources/config/services.xml @@ -68,7 +68,7 @@ - %ems_common.search_via_backend% + %ems_common.elasticsearch_proxy_api% diff --git a/elasticms-web/config/packages/ems_common.yaml b/elasticms-web/config/packages/ems_common.yaml index f82490727..dbf1e2c8e 100644 --- a/elasticms-web/config/packages/ems_common.yaml +++ b/elasticms-web/config/packages/ems_common.yaml @@ -16,7 +16,7 @@ parameters: env(EMS_BACKEND_URL): ~ env(EMS_BACKEND_API_KEY): ~ env(EMS_BACKEND_API_VERIFY): true - env(EMS_SEARCH_VIA_BACKEND): false + env(EMS_ELASTICSEARCH_PROXY_API): false env(EMS_CACHE): 'file_system' env(EMS_CACHE_PREFIX): ~ @@ -39,7 +39,7 @@ ems_common: backend_url: '%env(string:EMS_BACKEND_URL)%' backend_api_key: '%env(string:EMS_BACKEND_API_KEY)%' backend_api_verify: '%env(bool:EMS_BACKEND_API_VERIFY)%' - search_via_backend: '%env(bool:EMS_SEARCH_VIA_BACKEND)%' + elasticsearch_proxy_api: '%env(bool:EMS_ELASTICSEARCH_PROXY_API)%' excluded_content_types: '%env(json:EMS_EXCLUDED_CONTENT_TYPES)%' webalize: removable_regex: '%env(string:EMS_WEBALIZE_REMOVABLE_REGEX)%'