Merge pull request #743 from City-of-Helsinki/UHF-10549

UHF-10549
City-of-Helsinki · Dec 3, 2024 · 1caa8f3 · 1caa8f3
2 parents 88d50f2 + 8646178
commit 1caa8f3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/conf/cmi/search_api.index.schools.yml b/conf/cmi/search_api.index.schools.yml
@@ -4,15 +4,15 @@ status: true
 dependencies:
   config:
     - field.storage.tpr_unit.field_ontologyword_details
-    - search_api.server.elastic_kasko
+    - search_api.server.default
   module:
     - helfi_kasko_content
     - helfi_react_search
     - helfi_tpr
   enforced:
     config:
       - field.storage.tpr_unit.field_ontologyword_details
-      - search_api.server.elastic_kasko
+      - search_api.server.default
     module:
       - search_api
       - helfi_react_search
@@ -143,4 +143,4 @@ options:
   cron_limit: 50
   index_directly: true
   track_changes_in_references: true
-server: elastic_kasko
+server: default
diff --git a/conf/cmi/search_api.server.elastic_kasko.yml → conf/cmi/search_api.server.default.yml b/conf/cmi/search_api.server.elastic_kasko.yml → conf/cmi/search_api.server.default.yml
@@ -4,7 +4,7 @@ status: true
 dependencies:
   module:
     - elasticsearch_connector
-id: elastic_kasko
+id: default
 name: 'Elastic kasko'
 description: ''
 backend: elasticsearch

diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
@@ -9,17 +9,6 @@
   'sql_mode' => 'SET sql_mode="STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_ENGINE_SUBSTITUTION"',
 ];
 
-// Elasticsearch settings.
-if (getenv('ELASTICSEARCH_URL')) {
-  $config['search_api.server.elastic_kasko']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
-
-  if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
-    $config['search_api.server.elastic_kasko']['backend_config']['connector'] = 'basicauth';
-    $config['search_api.server.elastic_kasko']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
-    $config['search_api.server.elastic_kasko']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
-  }
-}
-
 // Elastic proxy URL.
 $config['elastic_proxy.settings']['elastic_proxy_url'] = getenv('ELASTIC_PROXY_URL');