diff --git a/doc/settings/redis.md b/doc/settings/redis.md index 0f8b1eedf7771b2670601b3403f5c39c1e8f6760_ZG9jL3NldHRpbmdzL3JlZGlzLm1k..c8b5671d89ce72629ef88c67c34b4daebbb63a72_ZG9jL3NldHRpbmdzL3JlZGlzLm1k 100644 --- a/doc/settings/redis.md +++ b/doc/settings/redis.md @@ -28,3 +28,13 @@ Note that GitLab and GitLab CI are not designed to share a single Redis instance. This is why omnibus-gitlab has separate `redis` and `ci_redis` services. + +## Making a bundled Redis instance reachable via TCP + +Use the following settings if you want to make one of the Redis instances +managed by omnibus-gitlab reachable via TCP. + +```ruby +redis['port'] = 6379 +redis['bind'] = '127.0.0.1' +``` diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 0f8b1eedf7771b2670601b3403f5c39c1e8f6760_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi..c8b5671d89ce72629ef88c67c34b4daebbb63a72_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -253,6 +253,7 @@ default['gitlab']['redis']['gid'] = nil default['gitlab']['redis']['shell'] = "/bin/nologin" default['gitlab']['redis']['home'] = "/var/opt/gitlab/redis" +default['gitlab']['redis']['bind'] = '127.0.0.1' default['gitlab']['redis']['port'] = 0 default['gitlab']['redis']['unixsocket'] = "/var/opt/gitlab/redis/redis.socket" default['gitlab']['redis']['unixsocketperm'] = "777" diff --git a/files/gitlab-cookbooks/gitlab/templates/default/redis.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/redis.conf.erb index 0f8b1eedf7771b2670601b3403f5c39c1e8f6760_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvcmVkaXMuY29uZi5lcmI=..c8b5671d89ce72629ef88c67c34b4daebbb63a72_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvcmVkaXMuY29uZi5lcmI= 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/redis.conf.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/redis.conf.erb @@ -36,7 +36,7 @@ # Examples: # # bind 192.168.1.100 10.0.0.1 -bind 127.0.0.1 +bind <%= @bind %> # Specify the path for the unix socket that will be used to listen for # incoming connections. There is no default, so Redis will not listen