Use ENV for Redis credentials

config/credentials.example.yml

@@ -6,14 +6,11 @@ github_client_id: b657ae74187b2166988f
 github_client_id_stg: 4a9dc06681e485b406de
 github_client_secret: 64875198becbc7b301d308fd500ad552506d19f7
 github_client_secret_stg: 3f851c5a870ede307ea48a25d94e9e5d0a9d30e4
-rails_cache_redis_password: 6be482269cb7812bceda2d5f2fc5c35f
 raven_dsn: https://c2135b1d5f8fb794379ee872f12ab4ea:3d96e586a0099b6fde62460c3f72415f@sentry.io/6865229
 recaptcha_secret_key: 6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe
 recaptcha_secret_key_stg: 6Lc6BAAAAAAAAKN3DRm6VA_UF7hM3nvP03owVwPX4b0yYVscpt
 secret_key_base: d6d481302491e4bcb317d385716d43781a676f0991e6528d1f77434122d2409e1ee4cd9d20667f2cfbdb474119a2e39df2c813e2c0a91c13d4f9bdd829dcd65b
 sendgrid_api_key: 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
-sidekiq_client_redis_password: 2e3e2b886b50925f82cbe3edc917f4dd
-sidekiq_server_redis_password: 0c62869cb0bee44f3e3ba07aac2f04c8
 superuser_email: admin@example.com
 superuser_password: 77a021e17525fe158dc90d093e5afd27
 telegram_bot_api_token: 123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11

config/credentials.yml.enc

@@ -1 +1 @@
-IBeAjbO3szloNpc7KPeiE8DalsGgUsIIJT+eavoomP6tPNEoAEy10WblxXvIO98YlLSVBfCIyJHxWu3GCCi8YgpOyzXcQESmsznrx3NWqh5dO0cnRJePxdLGRpX139Kzs0ukqROe3xgGb/xpP8J4hFTKmTY/tfIkryJxGo+o3tcuKhJ1pwJtr1hP3Xb9oyZDSdf2yvK/gLts0xxS2+gJYrlIgXxKJkGtUqWbzpzPFmyOhGTOfsj+82P9/aee8PRn1574wGKS731GT2HjDavAsDD1OkjWuGJGUsT6CrM4DmWtJoKroADvz26Rn/7Nsz8wIsPTTda4zhMQheoS++u6ryiWkH+MI/kmDFqvgrqw1iLwn1CQhOkfgZZobzOuy8aVCTBu06oT7w1fAuplU0Y3KIuoqxAHSVN2QXvP5NlEd+0jGE0th9Iye0+neqGC8KnXO2XqxDtuEjlbMXFPBLrtqLip1ILptjX1SvLOqpLYBkTKty8R+EIrdP5t4nWevuFErN1GTaA+TI7eZGZeVtSVgMNwKh0vaZylNnxBlaWctU1SaWVIhxjOvhPhpNHgO1rpwDnKRr1Vji9ltM15MmX6K+VXigAwGNo4YJaFtX0dJlOX6pyUvUt8QL8Z7tm4T8d/q2/ZbyhLrxCxK5CcRwqxHxGKMrmYsTEFYoqGDsNj7BBBVotnFaRNgFiBY6cW0H+VFJhp5RP05lZ4LHAm/cvRaXh9pf53Obcjmx9LQlm2mnmMkXtFkPxa8svUI/oOiQSS4LaCkJOxb+fiDiySPO766TPHb4QaU1Wcow5dfi/6WW/1E5HYfbIOjDbxwQNuQ9ZwemxPOMi7pVbHMo+ssi8b2ka4BbOoyVp8QpyGLm3uM0l4/NVo0FgwLjW/rybzHzWNISGgFhNRtW6JDf0ijNMMntlaRVizxx+p36Miv+QdwIbkyD1rNSP2R7oWiqePaqI+Vae2hptHladhBZZOKbs8WpSnSCQcmYo0P1xgpinooMNxJ5yeiBKUPW2rqHTAa5q+j7BriJ5ppaYzeppwIvnYpm2eMYp3bJAu8FLjPFA2eJ/E0QMnwZPtJW2HOmsPhS1Qbs1ZfzBZLVnNCH4L1XBbtBPc/nvtOdTfeoxmwOf1c5DKJETr0xsKrwiXmSvRZzBXNW99OqpoDduFl7c2v9fc4N6Gou+oBXsp2nVG3MNDiiftxUNPNtFUa/euSfbTWR36XAnIcnUCxuSL1QHIOym8PL209W+FyDj1u1FPO21upq84v0LibHLpOq2+2vUFFbKBTTMH4Tsf8F7zFOe7zaoOD5ZfeWJl31+EI0rQ9g3ANfwRX2IIkLtD18URKKdX3gtcj7oJKWqwG1SnIuWEUNV7mNX3d8FJKRk1C93J9ChlpJWWvZnXlQqGabQF42wiMOOlVojqyNTHRVm5+XAregH7ZTHUbIJOdk1BHfbEQVRodkj34Omn+B9zv0r4kfkjbf7PyEhc3wscqKMQ5zqHHQzJtU0roOdO8EeRYdpnu+sxnN8pBM9/Y+wWQw2fWHXZKMBNEB50Sn4aJ1iK6nWOvYfJOGwItOB4S5FIwuT3XNgc+Ya15uB1xWHNKbAoF0xUKig4UWuv+Mqr4g3qYycLtBSZv+uwesaURALasIf4AHYGrx38rTa+l+FmDC0PT5OFOqmttEfcOE3G1zasrYP01Vl9QAw3W+1tNyMpa7/8hz0HQo5rFfs7s2ArbCzUONAPraOJsOY1ETh0lz5lF3q2iA9z7W1K3a9xR00fH4DlwAdrpMvfVXnHgbkiLpv7lOJ1fnnL4NYVhQLryKrrnzwS+zEhhSbGV9frLvY3MvigOdEyb/3N5cc=--AUuWYiJLv8p6sojG--i4t46tNG+0uJ3+94/xyDPQ==
+UX4pwgJJWRnS3FeZdXStHLJGLYeTx0clbLbOyZx5BHMkWCeXPcoVl6SEX6DX5WQnt0HLx8KAEn+bEat0RJFyBxGKMfpRY12pluvxVmjXZFSZC3hJhOqPbA7Bm5QcH9MsP6OHadgel84vVYSBoMjFNm5TLZwRwVzwbqffM6MTmB1/u1YaOYjS4XdAg1XNdA9X2IZzZWy2tzaa/vmgThVLHxAGnZjZdOgki8JAg0EfhvJPqa6SZYIByrpcoi6RQ1YPKq45TVXNhsb7bcv7cHjvdo3ZGf0H47q75ETfT2PUnkfab+jxAeMr51ED+lrJMSihxrTUKs4TAbYvrjxaKLHxDDzwlGuXLpC9oqPbF3uJUXPc4bJP0vtkIhF0sGmjIBUG0EniYeCvNP+hyFwLwc5QqRLLXMOptEfhGx0AINYsxyeoLYEi5ozUMpOeM3Zva8oV0y0hsyXjUfmDqjduzKST5WM5vd7KcowwatGjKZv97vW2kK32+NhkCfoyEEody1HnzHLg1Aj/U357Mc8AHMx6zzwjLuvw+Gg/qhqaXwC2OHXvEEOvZ1sYzotT5jjiMMiB21vTxXodVKTerP/xmeI18kY407sXJTQRHA6j6ULt+T/R1ZFA5131vzqqFo4mB8Z7Vogsylrch7LfuXbXsY9qytHYYhjYKcOI4S5NniN/2ITPCGUDqHFNj3YPrVIiSXZ/viQvGHOs2rNvH8vrgLuzRwpEimnwa5KPxklXhA5hjYRgzRwLYjg0fD2slssbjhICu++/ST/RqSr4vIIiSHARrGpYN3pUVns7nDWPHz+i8qNWNbtaDqSJ5b7hFWPqpNOOaLyhoCVGgdg/ccpivF81zWRIhMc1WBX0l+XKK7fBOYSxfWsQo1EtTMLsdgNLzTgs6dIQjMLVAja6RQSCTqAk10CCTuGumT9gozDMnBtMGotERtzb/M2L0SgHByeePC5xbpmnxGkFuVtiLavVWfZp/uSVmTirwQMFH6H38Uxfm1YLAC7HsBAfvudl46OW/HoOnwO5wLtBqx+1lEHDpHFVvflgwLi7HbH+kC31PbnTUWVMuIgFp8rCQBrRx/g316ZYBxv1MAFAAH3V2bXMjX6berJGp2hJZu98/YLBeRQqx/BzBJ8EOub4ruO8vNyG6fZ+WPnqp5wyTgpMZJIiZQDSfx+XCk2sApREGiAWniCCLEy3w1Yc12CYGubDaSlL1Vie1kXVI0iSRCOTQQJTjBLJTQF8tU2XbITou2Y0J5yo1Hu3CkgeK+nQq8VGE3v1AMM8h483qEZw36cbkz8HLJZ9N36Wma5zFsepMIQetiABgDay9QfuAQH9ndWU2VHLvPLG9fKk5d3Uivx7AMWlk+iCT4vP+KV+Cpr58XiT3KiUGx2HYQTM/tF3wccWM2iuA+/Zp4BojSN7MOUitLcCp3Vo6OVaqc+5hXbUDVUrPiWGTHScDvsFJy7f/6ctxX3eYkXNDFhniApPpCrFmiFZHowaQHtgY7B+z2HZOCag2MGmSVC68LHV/S8x48+oHWK0FVS18Ng+0aOjk4/0X1Jl2Y4YL3VKHJnIw4axGN5cVVhH5LA1vcVQ4x60XWIvtiOJZVkvIoB9I4i+Vsme5oSB87hMiu6f+IXOJaTvTPrJy6+Qcp89i8AHhJM=--OlKPHZdDA5iTZhGO--O85veRhTiVRHLzCULpz4NQ==

config/settings/cache_store.yml

@@ -1,25 +1,20 @@
-default:
+default: &default
   host:     <%= ENV.fetch('RAILS_CACHE_REDIS_HOST')     { 'localhost' } %>
   port:     <%= ENV.fetch('RAILS_CACHE_REDIS_PORT')     { 6379        } %>
-  db:       <%= ENV.fetch('RAILS_CACHE_REDIS_DB')       { 1           } %>
   password: <%= ENV.fetch('RAILS_CACHE_REDIS_PASSWORD') { 'password'  } %>
 
 staging:
-  host:     'private-db-redis-lon1-72645-do-user-4455684-0.db.ondigitalocean.com'
-  port:     25061
-  password: <%= Rails.application.credentials.rails_cache_redis_password %>
-  db:       11
-  ssl:      true
+  <<: *default
+  db: <%= ENV.fetch('RAILS_CACHE_REDIS_DB') { 11 } %>
+  ssl: true
   ssl_params:
     verify_mode: <%= OpenSSL::SSL::VERIFY_NONE %>
     ca_file:     <%= Rails.root.join 'config', 'certs', 'redis.crt' %>
 
 production:
-  host:     'private-db-redis-lon1-72645-do-user-4455684-0.db.ondigitalocean.com'
-  port:     25061
-  password: <%= Rails.application.credentials.rails_cache_redis_password %>
-  db:       1
-  ssl:      true
+  <<: *default
+  db: <%= ENV.fetch('RAILS_CACHE_REDIS_DB') { 1 } %>
+  ssl: true
   ssl_params:
     verify_mode: <%= OpenSSL::SSL::VERIFY_NONE %>
     ca_file:     <%= Rails.root.join 'config', 'certs', 'redis.crt' %>

config/settings/sidekiq_client.yml

@@ -12,21 +12,17 @@ test:
   db: <%= ENV.fetch('SIDEKIQ_CLIENT_REDIS_DB') { 15 } %>
 
 staging:
-  host:     'private-db-redis-lon1-72645-do-user-4455684-0.db.ondigitalocean.com'
-  port:     25061
-  password: <%= Rails.application.credentials.sidekiq_client_redis_password %>
-  db:       10
-  ssl:      true
+  <<: *default
+  db: <%= ENV.fetch('SIDEKIQ_CLIENT_REDIS_DB') { 10 } %>
+  ssl: true
   ssl_params:
     verify_mode: <%= OpenSSL::SSL::VERIFY_NONE %>
     ca_file:     <%= Rails.root.join 'config', 'certs', 'redis.crt' %>
 
 production:
-  host:     'private-db-redis-lon1-72645-do-user-4455684-0.db.ondigitalocean.com'
-  port:     25061
-  password: <%= Rails.application.credentials.sidekiq_client_redis_password %>
-  db:       0
-  ssl:      true
+  <<: *default
+  db: <%= ENV.fetch('SIDEKIQ_CLIENT_REDIS_DB') { 0 } %>
+  ssl: true
   ssl_params:
     verify_mode: <%= OpenSSL::SSL::VERIFY_NONE %>
     ca_file:     <%= Rails.root.join 'config', 'certs', 'redis.crt' %>

config/settings/sidekiq_server.yml

@@ -12,21 +12,17 @@ test:
   db: <%= ENV.fetch('SIDEKIQ_SERVER_REDIS_DB') { 15 } %>
 
 staging:
-  host:     'private-db-redis-lon1-72645-do-user-4455684-0.db.ondigitalocean.com'
-  port:     25061
-  password: <%= Rails.application.credentials.sidekiq_server_redis_password %>
-  db:       10
-  ssl:      true
+  <<: *default
+  db: <%= ENV.fetch('SIDEKIQ_CLIENT_REDIS_DB') { 10 } %>
+  ssl: true
   ssl_params:
     verify_mode: <%= OpenSSL::SSL::VERIFY_NONE %>
     ca_file:     <%= Rails.root.join 'config', 'certs', 'redis.crt' %>
 
 production:
-  host:     'private-db-redis-lon1-72645-do-user-4455684-0.db.ondigitalocean.com'
-  port:     25061
-  password: <%= Rails.application.credentials.sidekiq_server_redis_password %>
-  db:       0
-  ssl:      true
+  <<: *default
+  db: <%= ENV.fetch('SIDEKIQ_CLIENT_REDIS_DB') { 0 } %>
+  ssl: true
   ssl_params:
     verify_mode: <%= OpenSSL::SSL::VERIFY_NONE %>
     ca_file:     <%= Rails.root.join 'config', 'certs', 'redis.crt' %>