Merge branch '1665-redis-3-2-5' into 'master'

Update Redis to 3.2.5

- Update Redis from 3.2.1 to 3.2.5
- Merge redis.conf diff between 3.2.1 and 3.2.5: https://github.com/antirez/redis/compare/3.2.1...3.2.5#diff-1a75827fc1e080d1600e2a6843aa311d

Closes #1665

See merge request !1057

CHANGELOG.md

@@ -7,6 +7,7 @@ omnibus-gitlab repository.
 
 - Switch the redis user's shell to /bin/false
 - NGINX listen on IPv6 by default (George Gooden)
+- Update Redis to 3.2.5 (Takuya Noguchi)
 
 8.13.2
 - Move mail_room queue from incoming_email to email_receiver

config/projects/gitlab.rb

@@ -69,7 +69,7 @@ config_guess_version =  Gitlab::Version.new('config_guess', "master")
 override :ruby, version: '2.3.1', source: { md5: '0d896c2e7fd54f722b399f407e48a4c6' }
 override :rubygems, version: '2.6.6'
 override :'chef-gem', version: '12.12.15'
-override :redis, version: '3.2.1', source: { md5: 'b311d4332326f1e6f86a461b4025636d' }
+override :redis, version: '3.2.5', source: { md5: 'd3d2b4dd4b2a3e07ee6f63c526b66b08' }
 override :postgresql, version: '9.2.18', source: { md5: 'fd175eb5f29557c6ef2eeaf340330f9a' }
 override :liblzma, version: '5.2.2', source: { md5: '7cf6a8544a7dae8e8106fdf7addfa28c' }
 override :libxml2, version: '2.9.4', source: { md5: 'ae249165c173b1ff386ee8ad676815f5' }

files/gitlab-cookbooks/gitlab/templates/default/redis.conf.erb

@@ -441,6 +441,35 @@ slave-priority 100
 # By default min-slaves-to-write is set to 0 (feature disabled) and
 # min-slaves-max-lag is set to 10.
 
+# A Redis master is able to list the address and port of the attached
+# slaves in different ways. For example the "INFO replication" section
+# offers this information, which is used, among other tools, by
+# Redis Sentinel in order to discover slave instances.
+# Another place where this info is available is in the output of the
+# "ROLE" command of a masteer.
+#
+# The listed IP and address normally reported by a slave is obtained
+# in the following way:
+#
+#   IP: The address is auto detected by checking the peer address
+#   of the socket used by the slave to connect with the master.
+#
+#   Port: The port is communicated by the slave during the replication
+#   handshake, and is normally the port that the slave is using to
+#   list for connections.
+#
+# However when port forwarding or Network Address Translation (NAT) is
+# used, the slave may be actually reachable via different IP and port
+# pairs. The following two options can be used by a slave in order to
+# report to its master a specific set of IP and port, so that both INFO
+# and ROLE will report those values.
+#
+# There is no need to use both the options if you need to override just
+# the port or the IP address.
+#
+# slave-announce-ip 5.5.5.5
+# slave-announce-port 1234
+
 ################################## SECURITY ###################################
 
 # Require clients to issue AUTH <PASSWORD> before processing any other