Merge pull request #911 from City-of-Helsinki/UHF-10719-es-errors

UHF-10719
City-of-Helsinki · Nov 11, 2024 · 68d0317 · 68d0317
2 parents 2624826 + 95316ac
commit 68d0317
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/conf/cmi/search_api.index.health_stations.yml b/conf/cmi/search_api.index.health_stations.yml
@@ -24,7 +24,7 @@ field_settings:
   coordinates:
     label: Coordinates
     property_path: coordinates
-    type: object
+    type: location
   id:
     label: ID
     datasource_id: 'entity:tpr_unit'

diff --git a/conf/cmi/search_api.server.elastic_sote.yml b/conf/cmi/search_api.server.elastic_sote.yml
@@ -9,10 +9,8 @@ name: 'Elastic sote'
 description: ''
 backend: elasticsearch
 backend_config:
-  connector: basicauth
+  connector: standard
   connector_config:
-    username: ''
-    password: ''
     url: 'http://elastic:9200'
     enable_debug_logging: false
   advanced:

diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
@@ -7,13 +7,12 @@
 
 // Elasticsearch settings.
 if (getenv('ELASTICSEARCH_URL')) {
-  $config['elasticsearch_connector.cluster.sote']['url'] = getenv('ELASTICSEARCH_URL');
+  $config['search_api.server.elastic_sote']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
 
   if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
-    $config['elasticsearch_connector.cluster.sote']['options']['use_authentication'] = '1';
-    $config['elasticsearch_connector.cluster.sote']['options']['authentication_type'] = 'Basic';
-    $config['elasticsearch_connector.cluster.sote']['options']['username'] = getenv('ELASTIC_USER');
-    $config['elasticsearch_connector.cluster.sote']['options']['password'] = getenv('ELASTIC_PASSWORD');
+    $config['search_api.server.elastic_sote']['backend_config']['connector'] = 'basicauth';
+    $config['search_api.server.elastic_sote']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
+    $config['search_api.server.elastic_sote']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
   }
 }