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: Rename elastic server #935

Merged
merged 1 commit into from
Dec 3, 2024
Merged

UHF-10549: Rename elastic server #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions conf/cmi/search_api.index.health_stations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ langcode: en
status: true
dependencies:
config:
- search_api.server.elastic_sote
- search_api.server.default
module:
- helfi_react_search
- helfi_tpr
Expand Down Expand Up @@ -119,4 +119,4 @@ options:
cron_limit: 50
index_directly: true
track_changes_in_references: true
server: elastic_sote
server: default
4 changes: 2 additions & 2 deletions conf/cmi/search_api.index.maternity_and_child_health_clinic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ langcode: en
status: true
dependencies:
config:
- search_api.server.elastic_sote
- search_api.server.default
module:
- helfi_react_search
- helfi_tpr
Expand Down Expand Up @@ -119,4 +119,4 @@ options:
cron_limit: 50
index_directly: true
track_changes_in_references: true
server: elastic_sote
server: default
2 changes: 1 addition & 1 deletion conf/cmi/search_api.server.elastic_sote.yml → conf/cmi/search_api.server.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ status: true
dependencies:
module:
- elasticsearch_connector
id: elastic_sote
id: default
name: 'Elastic sote'
description: ''
backend: elasticsearch
Expand Down
11 changes: 0 additions & 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,17 +5,6 @@
* Contains site specific overrides.
*/

// Elasticsearch settings.
if (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['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');
}
}

// Elastic proxy URL.
$config['elastic_proxy.settings']['elastic_proxy_url'] = getenv('ELASTIC_PROXY_URL');
$config['openid_connect.client.tunnistamo']['settings']['ad_roles'] = [
Expand Down