From 595cf135a40e5f0131c41e091cad6855fdfa6518 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Mon, 14 May 2018 14:50:56 +0200
Subject: [PATCH] Fix configuration and dico

---
 dicos/90_redis.xml      | 5 ++---
 tmpl/redis-cluster.conf | 8 ++++++--
 tmpl/redis.conf         | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dicos/90_redis.xml b/dicos/90_redis.xml
index 7b657c6..c9a089b 100644
--- a/dicos/90_redis.xml
+++ b/dicos/90_redis.xml
@@ -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>
diff --git a/tmpl/redis-cluster.conf b/tmpl/redis-cluster.conf
index 9d1d371..c466d83 100644
--- a/tmpl/redis-cluster.conf
+++ b/tmpl/redis-cluster.conf
@@ -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',[])
+   %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 for
+      %end if
+   %end for
 %end if
diff --git a/tmpl/redis.conf b/tmpl/redis.conf
index 9cff55e..042f537 100644
--- a/tmpl/redis.conf
+++ b/tmpl/redis.conf
@@ -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.
 #