diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-01-17 18:46:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 18:46:53 +0100 |
| commit | d7a7baa9a7f6b44a3c0b7232e909e456c9231543 (patch) | |
| tree | 7bab737c8ed6b113e213ba7334d28b6c9855a781 /config/initializers | |
| parent | 6cf44ca92c3b92df5bda32adb59258104f1ac9c5 (diff) | |
| parent | ab4f5f5da5229bbc33f3c86815eaf1e057c697b1 (diff) | |
Merge pull request #489 from ineffyble/master
Add Heroku deployment support
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/redis.rb | 1 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb index 3825710b8..3660c4a9b 100644 --- a/config/initializers/redis.rb +++ b/config/initializers/redis.rb @@ -3,5 +3,6 @@ Redis.current = Redis.new( host: ENV.fetch('REDIS_HOST') { 'localhost' }, port: ENV.fetch('REDIS_PORT') { 6379 }, + password: ENV.fetch('REDIS_PASSWORD') { false }, driver: :hiredis ) diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 63fdb3f16..ecdd07b08 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,10 +1,11 @@ host = ENV.fetch('REDIS_HOST') { 'localhost' } port = ENV.fetch('REDIS_PORT') { 6379 } +password = ENV.fetch('REDIS_PASSWORD') { false } Sidekiq.configure_server do |config| - config.redis = { host: host, port: port } + config.redis = { host: host, port: port, password: password} end Sidekiq.configure_client do |config| - config.redis = { host: host, port: port } + config.redis = { host: host, port: port, password: password } end |