Support authentication for ElasticSearch (#16890)

* Support authentication for ElasticSearch

* Fix chewy auth settings

diff --git a/.env.production.sample b/.env.production.sample
index 6f14c5804777cad613fd35aeda256d2a908dc578..86ae5d111308919a7f9123744b9687e133771d42 100644 (file)
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -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
 # -------

diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index 9fc9b2f1a59368e8d87322242a46ce2cb57e93b9..820182a21241f4c4cb3db7a7025497ee54b7e633 100644 (file)
--- 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' },
 }