mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-22 17:35:40 +01:00
Support authentication for ElasticSearch (#16890)
* Support authentication for ElasticSearch * Fix chewy auth settings
This commit is contained in:
parent
ec059317fa
commit
c8ce728705
2 changed files with 7 additions and 0 deletions
|
@ -28,6 +28,9 @@ DB_PORT=5432
|
|||
ES_ENABLED=true
|
||||
ES_HOST=localhost
|
||||
ES_PORT=9200
|
||||
# Authentication for ES (optional)
|
||||
ES_USER=elastic
|
||||
ES_PASS=password
|
||||
|
||||
# Secrets
|
||||
# -------
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
enabled = ENV['ES_ENABLED'] == 'true'
|
||||
host = ENV.fetch('ES_HOST') { 'localhost' }
|
||||
port = ENV.fetch('ES_PORT') { 9200 }
|
||||
user = ENV.fetch('ES_USER') { nil }
|
||||
password = ENV.fetch('ES_PASS') { nil }
|
||||
fallback_prefix = ENV.fetch('REDIS_NAMESPACE') { nil }
|
||||
prefix = ENV.fetch('ES_PREFIX') { fallback_prefix }
|
||||
|
||||
|
@ -9,6 +11,8 @@ Chewy.settings = {
|
|||
prefix: prefix,
|
||||
enabled: enabled,
|
||||
journal: false,
|
||||
user: user,
|
||||
password: password,
|
||||
sidekiq: { queue: 'pull' },
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue