diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
commit | e855df149bd2f19729af48cd5f452fa3972273f8 (patch) | |
tree | 4d9dab4fd4568f67b07642db61a2f382e8b1dcc0 /config/initializers | |
parent | c647fa99cab9b9db81d36223cf2c2c27e065b648 (diff) | |
parent | 5ba46952af87e42a64962a34f7ec43bc710bdcaf (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.
Diffstat (limited to 'config/initializers')
-rw-r--r-- | config/initializers/chewy.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb index 9fc9b2f1a..820182a21 100644 --- a/config/initializers/chewy.rb +++ b/config/initializers/chewy.rb @@ -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' }, } |