Download as
Browse Code »

Commit be2fce5628f4cbc95ce61bab13e1e40d0880f018

Authored by Jacob Vosmaer
1 parent f3101fe1
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Make options in redis.conf configurable

Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/templates/default/redis.conf.erb
  Diff comments   View file @be2fce5
@@ -22,7 +22,7 @@ pidfile /var/run/redis.pid @@ -22,7 +22,7 @@ pidfile /var/run/redis.pid
22 22
23 # Accept connections on the specified port, default is 6379. 23 # Accept connections on the specified port, default is 6379.
24 # If port 0 is specified Redis will not listen on a TCP socket. 24 # If port 0 is specified Redis will not listen on a TCP socket.
25 -port 6379 25 +port <%= node['gitlab']['redis']['port'] %>
26 26
27 # By default Redis listens for connections from all the network interfaces 27 # By default Redis listens for connections from all the network interfaces
28 # available on the server. It is possible to listen to just one or multiple 28 # available on the server. It is possible to listen to just one or multiple
@@ -32,7 +32,7 @@ port 6379 @@ -32,7 +32,7 @@ port 6379
32 # Examples: 32 # Examples:
33 # 33 #
34 # bind 192.168.1.100 10.0.0.1 34 # bind 192.168.1.100 10.0.0.1
35 -# bind 127.0.0.1 35 +bind 127.0.0.1
36 36
37 # Specify the path for the unix socket that will be used to listen for 37 # Specify the path for the unix socket that will be used to listen for
38 # incoming connections. There is no default, so Redis will not listen 38 # incoming connections. There is no default, so Redis will not listen
@@ -155,7 +155,7 @@ dbfilename dump.rdb @@ -155,7 +155,7 @@ dbfilename dump.rdb
155 # The Append Only File will also be created inside this directory. 155 # The Append Only File will also be created inside this directory.
156 # 156 #
157 # Note that you must specify a directory here, not a file name. 157 # Note that you must specify a directory here, not a file name.
158 -dir ./ 158 +dir <%= node['gitlab']['redis']['dir'] %>
159 159
160 ################################# REPLICATION ################################# 160 ################################# REPLICATION #################################
161 161