Merge branch 'master' into dist/eole/2.6.2/master
This commit is contained in:
commit
ee74f2df2e
|
@ -71,6 +71,11 @@
|
||||||
<condition name='disabled_if_in' source='redisRole'>
|
<condition name='disabled_if_in' source='redisRole'>
|
||||||
<param>Node</param>
|
<param>Node</param>
|
||||||
<target type='filelist'>redisCl</target>
|
<target type='filelist'>redisCl</target>
|
||||||
|
<target type='variable'>rdClMember</target>
|
||||||
|
<target type='variable'>rdClMemberIP</target>
|
||||||
|
<target type='variable'>rdClMemberPort</target>
|
||||||
|
<target type='variable'>rdClMemberRole</target>
|
||||||
|
<target type='variable'>rdClMemberMaster</target>
|
||||||
</condition>
|
</condition>
|
||||||
|
|
||||||
<condition name='disabled_if_in' source='rdClMemberRole'>
|
<condition name='disabled_if_in' source='rdClMemberRole'>
|
||||||
|
|
|
@ -77,7 +77,7 @@ bind 0.0.0.0
|
||||||
# you are sure you want clients from other hosts to connect to Redis
|
# you are sure you want clients from other hosts to connect to Redis
|
||||||
# even if no authentication is configured, nor a specific set of interfaces
|
# even if no authentication is configured, nor a specific set of interfaces
|
||||||
# are explicitly listed using the "bind" directive.
|
# are explicitly listed using the "bind" directive.
|
||||||
protected-mode yes
|
protected-mode no
|
||||||
|
|
||||||
# Accept connections on the specified port, default is 6379 (IANA #815344).
|
# Accept connections on the specified port, default is 6379 (IANA #815344).
|
||||||
# If port 0 is specified Redis will not listen on a TCP socket.
|
# If port 0 is specified Redis will not listen on a TCP socket.
|
||||||
|
|
Loading…
Reference in New Issue