Redis password config

Fixes #729

See merge request !486

CHANGELOG.md

@@ -3,6 +3,10 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
+7.14.3
+
+- Add redis password option when using TCP auth d847479b8bcb523110aae9230bcf480def3eab15
+
 7.14.2
 - Update gitlab-git-http-server to version 0.2.9 82a3bec2eb3f006bb9327a59608f99cae81d5c92

files/gitlab-config-template/gitlab.rb.template

@@ -197,6 +197,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['redis_host'] = "127.0.0.1"
 # gitlab_rails['redis_port'] = nil
+# gitlab_rails['redis_password'] = nil
 # gitlab_rails['redis_database'] = 0
 # gitlab_rails['redis_socket'] = "/var/opt/gitlab/redis/redis.socket"

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -165,6 +165,7 @@ default['gitlab']['gitlab-rails']['db_sslrootcert'] = nil
 default['gitlab']['gitlab-rails']['redis_host'] = "127.0.0.1"
 default['gitlab']['gitlab-rails']['redis_port'] = nil
+default['gitlab']['gitlab-rails']['redis_password'] = nil
 default['gitlab']['gitlab-rails']['redis_socket'] = "/var/opt/gitlab/redis/redis.socket"
 default['gitlab']['gitlab-rails']['smtp_enable'] = false

files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb

@@ -99,7 +99,8 @@ template_symlink File.join(gitlab_rails_etc_dir, "database.yml") do
 end
 if node['gitlab']['gitlab-rails']['redis_port']
-  redis_url = "redis://#{node['gitlab']['gitlab-rails']['redis_host']}:#{node['gitlab']['gitlab-rails']['redis_port']}"
+  redis_auth = ":#{node['gitlab']['gitlab-rails']['redis_password']}@" if node['gitlab']['gitlab-rails']['redis_password']
+  redis_url = "redis://#{redis_auth}#{node['gitlab']['gitlab-rails']['redis_host']}:#{node['gitlab']['gitlab-rails']['redis_port']}"
 else
   redis_url = "unix:#{node['gitlab']['gitlab-rails']['redis_socket']}"
 end

files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb

@@ -94,6 +94,7 @@ template_symlink File.join(gitlab_shell_var_dir, "config.yml") do
     :redis_host => node['gitlab']['gitlab-rails']['redis_host'],
     :redis_port => redis_port,
     :redis_socket => redis_socket,
+    :redis_password => node['gitlab']['gitlab-rails']['redis_password'],
     :redis_database => node['gitlab']['gitlab-rails']['redis_database'],
     :log_file => File.join(log_directory, "gitlab-shell.log"),
     :log_level => node['gitlab']['gitlab-shell']['log_level'],

files/gitlab-cookbooks/gitlab/templates/default/gitlab-shell-config.yml.erb

@@ -32,6 +32,9 @@ redis:
   port: <%= @redis_port %>
 <% if @redis_socket %>
   socket: <%= @redis_socket %>
+<% end %>
+<% if @redis_password %>
+  pass: <%= @redis_password %>
 <% end %>
   database: <%= @redis_database %>
   namespace: resque:gitlab