Merge branch 'master' into dist/eole/2.6.2/master
This commit is contained in:
commit
f2740a38bc
|
@ -43,14 +43,13 @@
|
|||
<value>Leader</value>
|
||||
</variable>
|
||||
<variable name='redisMasterIP' type='ip' description="Adresse IP du Leader Redis"/>
|
||||
<variable name='redisMasterIP' type='ip' description="Adresse IP du Leader Redis"/>
|
||||
<variable name='redisMasterPort' type='number' description="Port d'écoute du Leader Redis"/>
|
||||
<variable name='redisMasterPassword' type='string' description="Passphrase d'accès à la grappe Redis"/>
|
||||
<variable name='rdClMember' type='ip' description="Nom du noeud" multi='True'/>
|
||||
<variable name='rdClMember' type='string' description="Nom du noeud" multi='True'/>
|
||||
<variable name='rdClMemberIP' type='ip' description="Adresse IP du noeud" multi='True'/>
|
||||
<variable name='rdClMemberPort' type='number' description="Port d'écoute du noeud" multi='True'/>
|
||||
<variable name='rdClMemberRole' type='ip' description="Rôle du membre"/>
|
||||
<variable name='rdClMemberMaster' type='ip' description="Noeud source des données pour ce membre"/>
|
||||
<variable name='rdClMemberMaster' type='string' description="Noeud source des données pour ce membre"/>
|
||||
</family>
|
||||
<separators>
|
||||
<separator name='rdClIP'>Autorisation d'accès au service Redis</separator>
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
%if %%getVar('activer_redis','non') == 'oui' and %%getVar('redisRole','Node') == 'Leader'
|
||||
Leader:127.0.0.1:%%{redisPort}:master::
|
||||
%for %%node in %%getVar('rdClMember',[])
|
||||
%if %%node.rdClMemberRole == 'master'
|
||||
%%{node}:%%{node.rdClMemberIP}:%%{node.rdClMemberPort}:%%{node.rdClMemberRole}::
|
||||
%else
|
||||
%%{node}:%%{node.rdClMemberIP}:%%{node.rdClMemberPort}:%%{node.rdClMemberRole}:%%{node.rdClMemberMaster}:
|
||||
%end if
|
||||
%end for
|
||||
%end if
|
||||
|
|
|
@ -478,7 +478,7 @@ slave-priority 100
|
|||
# 150k passwords per second against a good box. This means that you should
|
||||
# use a very strong password otherwise it will be very easy to break.
|
||||
#
|
||||
requirepass %%redisMasterPassword
|
||||
#requirepass %%redisMasterPassword
|
||||
|
||||
# Command renaming.
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue