Merge branch 'redis_password' into 'master'

Redis password config

Fixes #729 

See merge request !486

CHANGELOG.md

@@ -8,6 +8,10 @@ omnibus-gitlab repository.
 - Update gitlab-git-http-server to 0.2.10
 - Restart gitlab-git-http-server on version change
 
+8.0.2
+
+- Add redis password option when using TCP auth
+
 8.0.1
 
 - Revert "Do not buffer with nginx git http requests"

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

@@ -221,6 +221,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

@@ -182,6 +182,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

@@ -119,7 +119,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

@@ -95,6 +95,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