erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Merge 5d385b7c8e into a50c8e951f

Browse source
This commit is contained in:
Matt Jankowski 2024-07-31 14:07:11 +00:00 committed by GitHub
commit 98a3be7d8e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/admin/system_check/elasticsearch_check.rb
View file

@ -116,7 +116,7 @@ class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
end end
def es_preset def es_preset
ENV.fetch('ES_PRESET', 'single_node_cluster') Rails.configuration.x.search.preset
end end
def preset_matches? def preset_matches?

2
config/application.rb
View file

@ -112,6 +112,8 @@ module Mastodon
end end
end end
config.x.search = config_for(:search)
config.to_prepare do config.to_prepare do
Doorkeeper::AuthorizationsController.layout 'modal' Doorkeeper::AuthorizationsController.layout 'modal'
Doorkeeper::AuthorizedApplicationsController.layout 'admin' Doorkeeper::AuthorizedApplicationsController.layout 'admin'

25
config/initializers/chewy.rb
View file

@ -1,27 +1,18 @@
# frozen_string_literal: true # frozen_string_literal: true
enabled = ENV['ES_ENABLED'] == 'true' search_config = Rails.configuration.x.search
host = ENV.fetch('ES_HOST') { 'localhost' }
port = ENV.fetch('ES_PORT') { 9200 }
user = ENV.fetch('ES_USER', nil).presence
password = ENV.fetch('ES_PASS', nil).presence
fallback_prefix = ENV.fetch('REDIS_NAMESPACE', nil).presence
prefix = ENV.fetch('ES_PREFIX') { fallback_prefix }
ca_file = ENV.fetch('ES_CA_FILE', nil).presence
transport_options = { ssl: { ca_file: ca_file } } if ca_file.present?
Chewy.settings = { Chewy.settings = {
host: "#{host}:#{port}", host: search_config.host,
prefix: prefix, prefix: search_config.prefix,
enabled: enabled, enabled: search_config.enabled,
journal: false, journal: false,
user: user, user: search_config.user,
password: password, password: search_config.password,
index: { index: {
number_of_replicas: ['single_node_cluster', nil].include?(ENV['ES_PRESET'].presence) ? 0 : 1, number_of_replicas: search_config.preset == 'single_node_cluster' ? 0 : 1,
}, },
transport_options: transport_options, transport_options: search_config.ca_file.present? ? { ssl: { ca_file: search_config.ca_file } } : nil,
} }
# We use our own async strategy even outside the request-response # We use our own async strategy even outside the request-response

8
config/search.yml Normal file
View file

@ -0,0 +1,8 @@
shared:
ca_file: <%= ENV.fetch('ES_CA_FILE', nil).presence %>
enabled: <%= ENV.fetch('ES_ENABLED', 'false') %>
host: <%= ENV.fetch('ES_HOST', 'localhost') %>:<%= ENV.fetch('ES_PORT', '9200') %>
password: <%= ENV.fetch('ES_PASS', nil).presence %>
prefix: <%= ENV.fetch('ES_PREFIX') { ENV.fetch('REDIS_NAMESPACE', nil).presence } %>
preset: <%= ENV.fetch('ES_PRESET', 'single_node_cluster') %>
user: <%= ENV.fetch('ES_USER', nil).presence %>

4
lib/chewy/index_extensions.rb
View file

@ -3,8 +3,8 @@
module Chewy module Chewy
module IndexExtensions module IndexExtensions
def index_preset(base_options = {}) def index_preset(base_options = {})
case ENV['ES_PRESET'].presence case Rails.configuration.x.search.preset
when 'single_node_cluster', nil when 'single_node_cluster'
base_options.merge(number_of_replicas: 0) base_options.merge(number_of_replicas: 0)
when 'small_cluster' when 'small_cluster'
base_options.merge(number_of_replicas: 1) base_options.merge(number_of_replicas: 1)