mirror of https://github.com/Siphonay/mastodon
Add support for specifying custom CA cert for Elasticsearch (#29122)
This commit is contained in:
parent
eeabf9af72
commit
2912829411
|
@ -7,6 +7,9 @@ user = ENV.fetch('ES_USER', nil).presence
|
||||||
password = ENV.fetch('ES_PASS', nil).presence
|
password = ENV.fetch('ES_PASS', nil).presence
|
||||||
fallback_prefix = ENV.fetch('REDIS_NAMESPACE', nil).presence
|
fallback_prefix = ENV.fetch('REDIS_NAMESPACE', nil).presence
|
||||||
prefix = ENV.fetch('ES_PREFIX') { fallback_prefix }
|
prefix = ENV.fetch('ES_PREFIX') { fallback_prefix }
|
||||||
|
ca_file = ENV.fetch('ES_CA_CERT', nil).presence
|
||||||
|
|
||||||
|
transport_options = { ssl: { ca_file: ca_file } } if ca_file.present?
|
||||||
|
|
||||||
Chewy.settings = {
|
Chewy.settings = {
|
||||||
host: "#{host}:#{port}",
|
host: "#{host}:#{port}",
|
||||||
|
@ -18,6 +21,7 @@ Chewy.settings = {
|
||||||
index: {
|
index: {
|
||||||
number_of_replicas: ['single_node_cluster', nil].include?(ENV['ES_PRESET'].presence) ? 0 : 1,
|
number_of_replicas: ['single_node_cluster', nil].include?(ENV['ES_PRESET'].presence) ? 0 : 1,
|
||||||
},
|
},
|
||||||
|
transport_options: transport_options,
|
||||||
}
|
}
|
||||||
|
|
||||||
# We use our own async strategy even outside the request-response
|
# We use our own async strategy even outside the request-response
|
||||||
|
|
Loading…
Reference in New Issue