Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UHF-10549 #387

Merged
merged 3 commits into from
Dec 3, 2024
Merged

UHF-10549 #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f48a2eb
UHF-10549: Move elasticsearch settings to settings.php
hyrsky Dec 2, 2024
6891c7c
UHF-10549: Remove hook from old elasticsearch_connector version
hyrsky Dec 2, 2024
f27946e
UHF-10549: Rename environment variable
hyrsky Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions public/modules/custom/infofinland_common/infofinland_common.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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().
*/
Expand Down
12 changes: 1 addition & 11 deletions public/sites/default/all.settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -38,7 +28,7 @@
'SENTRY_ENVIRONMENT',
// Project specific variables.
'DRUPAL_PREVIEW_SECRET',
'ELASTIC_URL',
'ELASTICSEARCH_URL',
'ELASTIC_USER',
'ELASTIC_PASSWORD',
'INFOFINLAND_UI_PREVIEW_URL',
Expand Down