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: Accept self-signed certificates from elasticsearch #986

Merged
merged 3 commits into from
Dec 3, 2024
Merged

UHF-10549: Accept self-signed certificates from elasticsearch #986

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
a8e9ecb
UHF-10549: Accept self-signed certificates from elasticsearch
hyrsky Nov 29, 2024
8766989
UHF-10549: Rename config
hyrsky Dec 2, 2024
e2a3ca6
UHF-10549: Move elasticsearch settings to settings.php
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
4 changes: 2 additions & 2 deletions conf/cmi/search_api.index.districts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- field.storage.node.field_district_image
- field.storage.node.field_district_search_metatags
- field.storage.node.field_subdistricts
- search_api.server.elastic_kymp
- search_api.server.default
module:
- helfi_react_search
- media
Expand Down Expand Up @@ -174,4 +174,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
server: elastic_kymp
server: default
4 changes: 2 additions & 2 deletions conf/cmi/search_api.index.districts_for_filters.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_kymp
- search_api.server.default
module:
- helfi_react_search
- node
Expand Down Expand Up @@ -60,4 +60,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
server: elastic_kymp
server: default
4 changes: 2 additions & 2 deletions conf/cmi/search_api.index.project_phases.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_kymp
- search_api.server.default
module:
- helfi_react_search
- taxonomy
Expand Down Expand Up @@ -62,4 +62,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
server: elastic_kymp
server: default
4 changes: 2 additions & 2 deletions conf/cmi/search_api.index.project_themes.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_kymp
- search_api.server.default
module:
- helfi_react_search
- taxonomy
Expand Down Expand Up @@ -60,4 +60,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
server: elastic_kymp
server: default
4 changes: 2 additions & 2 deletions conf/cmi/search_api.index.project_types.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_kymp
- search_api.server.default
module:
- helfi_react_search
- taxonomy
Expand Down Expand Up @@ -60,4 +60,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
server: elastic_kymp
server: default
4 changes: 2 additions & 2 deletions conf/cmi/search_api.index.projects.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- field.storage.node.field_project_search_metatags
- field.storage.node.field_project_theme
- field.storage.node.field_project_type
- search_api.server.elastic_kymp
- search_api.server.default
module:
- helfi_react_search
- media
Expand Down Expand Up @@ -230,4 +230,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
server: elastic_kymp
server: default
4 changes: 2 additions & 2 deletions conf/cmi/search_api.index.street_data.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_kymp
- search_api.server.default
module:
- helfi_kymp_content
- helfi_react_search
Expand Down Expand Up @@ -52,4 +52,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
server: elastic_kymp
server: default
2 changes: 1 addition & 1 deletion conf/cmi/search_api.server.elastic_kymp.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_kymp
id: default
name: 'Elastic KYMP'
description: ''
backend: elasticsearch
Expand Down
10 changes: 0 additions & 10 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.
*/

// Elasticsearch settings.
if (getenv('ELASTICSEARCH_URL')) {
$config['search_api.server.elastic_kymp']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');

if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
$config['search_api.server.elastic_kymp']['backend_config']['connector'] = 'basicauth';
$config['search_api.server.elastic_kymp']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
$config['search_api.server.elastic_kymp']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
}
}
// Elastic proxy URL.
$config['elastic_proxy.settings']['elastic_proxy_url'] = getenv('ELASTIC_PROXY_URL');
// Sentry DSN for React.
Expand Down