paravielfalt/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Activity Actions

Support authentication for ElasticSearch (#16890)

Browse source 
* Support authentication for ElasticSearch

* Fix chewy auth settings
This commit is contained in:
Jeong Arm 2021-10-25 00:20:03 +09:00 committed by GitHub
parent ec059317fa
commit c8ce728705
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.env.production.sample
View file

@ -28,6 +28,9 @@ DB_PORT=5432
ES_ENABLED=true ES_ENABLED=true
ES_HOST=localhost ES_HOST=localhost
ES_PORT=9200 ES_PORT=9200
# Authentication for ES (optional)
ES_USER=elastic
ES_PASS=password
# Secrets # Secrets
# ------- # -------

4
config/initializers/chewy.rb
View file

@ -1,6 +1,8 @@
enabled = ENV['ES_ENABLED'] == 'true' enabled = ENV['ES_ENABLED'] == 'true'
host = ENV.fetch('ES_HOST') { 'localhost' } host = ENV.fetch('ES_HOST') { 'localhost' }
port = ENV.fetch('ES_PORT') { 9200 } 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 } fallback_prefix = ENV.fetch('REDIS_NAMESPACE') { nil }
prefix = ENV.fetch('ES_PREFIX') { fallback_prefix } prefix = ENV.fetch('ES_PREFIX') { fallback_prefix }
@ -9,6 +11,8 @@ Chewy.settings = {
prefix: prefix, prefix: prefix,
enabled: enabled, enabled: enabled,
journal: false, journal: false,
user: user,
password: password,
sidekiq: { queue: 'pull' }, sidekiq: { queue: 'pull' },
} }