Support external Redis instances

Jacob Vosmaer
1 parent 9b9ff9cb
Showing 7 changed files with 28 additions and 3 deletions Show diff stats
README.md
files/gitlab-cookbooks/gitlab/attributes/default.rb
files/gitlab-cookbooks/gitlab/libraries/gitlab.rb
files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
files/gitlab-cookbooks/gitlab/recipes/gitlab-shell.rb
files/gitlab-cookbooks/gitlab/templates/default/gitlab-shell-config.yml.erb
files/gitlab-cookbooks/gitlab/templates/default/resque.yml.erb
@@ -548,6 +548,18 @@ If you do do not want to use the packaged Postgres server you can configure an e
 Configuring a PostgreSQL server is possible both with GitLab Community Edition and Enterprise Edition packages.
 Please see the upstream GitLab for a [PostgreSQL configuration example][database.yml.postgresql].
  
+## Using a non-packaged Redis instance
+
+If you want to use your own Redis instance instead of the bundled Redis, you
+can use the `gitlab.rb` settings below. Run `gitlab-ctl reconfigure` for the
+settings to take effect.
+
+```ruby
+redis['enable'] = false
+gitlab_rails['redis_host'] = redis.example.com
+gitlab_rails['redis_port'] = 6380 # defaults to 6379
+```
+
 ## Building your own package
  
 See [the separate build documentation](doc/build.md).
@@ -128,6 +128,9 @@ default[&#39;gitlab&#39;][&#39;gitlab-rails&#39;][&#39;db_host&#39;] = nil
 default['gitlab']['gitlab-rails']['db_port'] = 5432
 default['gitlab']['gitlab-rails']['db_socket'] = nil
  
+default['gitlab']['gitlab-rails']['redis_host'] = "127.0.0.1"
+default['gitlab']['gitlab-rails']['redis_port'] = 6379
+
 default['gitlab']['gitlab-rails']['smtp_enable'] = false
 default['gitlab']['gitlab-rails']['smtp_address'] = nil
 default['gitlab']['gitlab-rails']['smtp_port'] = nil
@@ -139,6 +139,13 @@ module Gitlab
       end
     end
  
+    def parse_redis_settings
+      # No need to check redis['host'] because that setting is not configurable.
+      if redis['port']
+        Gitlab['gitlab_rails']['redis_port'] ||= redis['port']
+      end
+    end
+
     def generate_hash
       results = { "gitlab" => {} }
       [
@@ -166,6 +173,7 @@ module Gitlab
       parse_external_url
       parse_git_data_dir
       parse_udp_log_shipping
+      parse_redis_settings
       # The last step is to convert underscores to hyphens in top-level keys
       generate_hash
     end
@@ -84,6 +84,7 @@ template_symlink File.join(gitlab_rails_etc_dir, &quot;resque.yml&quot;) do
   owner "root"
   group "root"
   mode "0644"
+  variables(node['gitlab']['gitlab-rails'].to_hash)
   restarts dependent_services
 end
  
@@ -82,7 +82,8 @@ template_symlink File.join(gitlab_shell_var_dir, &quot;config.yml&quot;) do
     :api_url => api_url,
     :repositories_path => repositories_path,
     :authorized_keys => authorized_keys,
-    :redis_port => node['gitlab']['redis']['port'],
+    :redis_host => node['gitlab']['gitlab-rails']['redis_host'],
+    :redis_port => node['gitlab']['gitlab-rails']['redis_port'],
     :log_file => File.join(log_directory, "gitlab-shell.log")
   )
 end
@@ -27,7 +27,7 @@ auth_file: &quot;&lt;%= @authorized_keys %&gt;&quot;
 # Redis settings used for pushing commit notices to gitlab
 redis:
   bin: /opt/gitlab/embedded/bin/redis-cli
-  host: 127.0.0.1
+  host: <%= @redis_host %>
   port: <%= @redis_port %>
   # socket: /tmp/redis.socket # Only define this if you want to use sockets
   namespace: resque:gitlab
-production: redis://localhost:<%= node['gitlab']['redis']['port'] %>
+production: redis://<%= @redis_host %>:<%= @redis_port %>
...	...	@@ -548,6 +548,18 @@ If you do do not want to use the packaged Postgres server you can configure an e
548	548	Configuring a PostgreSQL server is possible both with GitLab Community Edition and Enterprise Edition packages.
549	549	Please see the upstream GitLab for a [PostgreSQL configuration example][database.yml.postgresql].
550	550
	551	+## Using a non-packaged Redis instance
	552	+
	553	+If you want to use your own Redis instance instead of the bundled Redis, you
	554	+can use the `gitlab.rb` settings below. Run `gitlab-ctl reconfigure` for the
	555	+settings to take effect.
	556	+
	557	+```ruby
	558	+redis['enable'] = false
	559	+gitlab_rails['redis_host'] = redis.example.com
	560	+gitlab_rails['redis_port'] = 6380 # defaults to 6379
	561	+```
	562	+
551	563	## Building your own package
552	564
553	565	See [the separate build documentation](doc/build.md).
...	...
...	...	@@ -128,6 +128,9 @@ default['gitlab']['gitlab-rails']['db_host'] = nil
128	128	default['gitlab']['gitlab-rails']['db_port'] = 5432
129	129	default['gitlab']['gitlab-rails']['db_socket'] = nil
130	130
	131	+default['gitlab']['gitlab-rails']['redis_host'] = "127.0.0.1"
	132	+default['gitlab']['gitlab-rails']['redis_port'] = 6379
	133	+
131	134	default['gitlab']['gitlab-rails']['smtp_enable'] = false
132	135	default['gitlab']['gitlab-rails']['smtp_address'] = nil
133	136	default['gitlab']['gitlab-rails']['smtp_port'] = nil
...	...
...	...	@@ -139,6 +139,13 @@ module Gitlab
139	139	end
140	140	end
141	141
	142	+ def parse_redis_settings
	143	+ # No need to check redis['host'] because that setting is not configurable.
	144	+ if redis['port']
	145	+ Gitlab['gitlab_rails']['redis_port'] \|\|= redis['port']
	146	+ end
	147	+ end
	148	+
142	149	def generate_hash
143	150	results = { "gitlab" => {} }
144	151	[
...	...	@@ -166,6 +173,7 @@ module Gitlab
166	173	parse_external_url
167	174	parse_git_data_dir
168	175	parse_udp_log_shipping
	176	+ parse_redis_settings
169	177	# The last step is to convert underscores to hyphens in top-level keys
170	178	generate_hash
171	179	end
...	...
...	...	@@ -84,6 +84,7 @@ template_symlink File.join(gitlab_rails_etc_dir, "resque.yml") do
84	84	owner "root"
85	85	group "root"
86	86	mode "0644"
	87	+ variables(node['gitlab']['gitlab-rails'].to_hash)
87	88	restarts dependent_services
88	89	end
89	90
...	...
...	...	@@ -82,7 +82,8 @@ template_symlink File.join(gitlab_shell_var_dir, "config.yml") do
82	82	:api_url => api_url,
83	83	:repositories_path => repositories_path,
84	84	:authorized_keys => authorized_keys,
85		- :redis_port => node['gitlab']['redis']['port'],
	85	+ :redis_host => node['gitlab']['gitlab-rails']['redis_host'],
	86	+ :redis_port => node['gitlab']['gitlab-rails']['redis_port'],
86	87	:log_file => File.join(log_directory, "gitlab-shell.log")
87	88	)
88	89	end
...	...
...	...	@@ -27,7 +27,7 @@ auth_file: "<%= @authorized_keys %>"
27	27	# Redis settings used for pushing commit notices to gitlab
28	28	redis:
29	29	bin: /opt/gitlab/embedded/bin/redis-cli
30		- host: 127.0.0.1
	30	+ host: <%= @redis_host %>
31	31	port: <%= @redis_port %>
32	32	# socket: /tmp/redis.socket # Only define this if you want to use sockets
33	33	namespace: resque:gitlab
...	...
1		-production: redis://localhost:<%= node['gitlab']['redis']['port'] %>
	1	+production: redis://<%= @redis_host %>:<%= @redis_port %>
...	...