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

UHF-10549
City-of-Helsinki · Dec 3, 2024 · 91bdf85 · 91bdf85
2 parents 4ff8d9b + f27946e
commit 91bdf85
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/public/modules/custom/infofinland_common/infofinland_common.module b/public/modules/custom/infofinland_common/infofinland_common.module
@@ -568,16 +568,6 @@ function infofinland_common_entity_type_alter(array &$entity_types) {
   }
 }
 
-/**
- * Implements hook_elasticsearch_connector_load_library_options_alter().
- */
-function infofinland_common_elasticsearch_connector_load_library_options_alter(&$options, &$context) {
-  // Set cURL options to trust self-signed certificate.
-  // @todo instead of disabling verification, set CURLOPT_SSLCERT.
-  $options['curl'][CURLOPT_SSL_VERIFYPEER] = FALSE;
-  $options['curl'][CURLOPT_SSL_VERIFYHOST] = FALSE;
-}
-
 /**
  * Implements hook_preprocess_HOOK().
  */

diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
@@ -5,16 +5,6 @@
  * Contains site specific overrides.
  */
 
-if (getenv('ELASTIC_URL')) {
-  $config['search_api.server.default']['backend_config']['connector_config']['url'] = getenv('ELASTIC_URL');
-
-  if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
-    $config['search_api.server.default']['backend_config']['connector'] = 'basicauth';
-    $config['search_api.server.default']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
-    $config['search_api.server.default']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
-  }
-}
-
 if (getenv('INFOFINLAND_UI_URL')) {
   $config['next.next_site.infofinland_ui']['base_url'] = getenv('INFOFINLAND_UI_URL');
   $config['next.next_site.infofinland_ui']['preview_url'] = getenv('INFOFINLAND_UI_PREVIEW_URL');
@@ -38,7 +28,7 @@
   'SENTRY_ENVIRONMENT',
   // Project specific variables.
   'DRUPAL_PREVIEW_SECRET',
-  'ELASTIC_URL',
+  'ELASTICSEARCH_URL',
   'ELASTIC_USER',
   'ELASTIC_PASSWORD',
   'INFOFINLAND_UI_PREVIEW_URL',