From e164823580bccade7c0bedd29e63443f310684f0 Mon Sep 17 00:00:00 2001
From: Teddy Cornaut <tcornaut@cadoles.com>
Date: Tue, 4 Sep 2018 15:57:54 +0200
Subject: [PATCH] Correction du mode local avec slave distant

---
 dicos/90_redis.xml    | 17 ++++++++++++++++-
 tmpl/redis-slave.conf |  6 ++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/dicos/90_redis.xml b/dicos/90_redis.xml
index d663b88..9bcfde4 100644
--- a/dicos/90_redis.xml
+++ b/dicos/90_redis.xml
@@ -49,9 +49,15 @@
             <!-- Instance Secondaire -->
             <variable name='redisSlaveInstanceName' type='string' description="Nom de l'instance secondaire"/>
             <variable name='redisSlaveInstanceMaster' type='string' description="Nom du noeud a répliquer sur l'instance secondaire"/>
-            <variable name='redisPortSlave' type='number' description="Port d'écoute du service Redis">
+            <variable name='redisMasterIPSlave' type='ip' description="IP du service Redis master">
+                <value>127.0.0.1</value>
+            </variable>
+            <variable name='redisMasterPortSlave' type='number' description="Port d'écoute du service Redis master">
                 <value>6379</value>
             </variable>
+            <variable name='redisPortSlave' type='number' description="Port d'écoute du service Redis slave">
+                <value>8379</value>
+            </variable>
             <variable name='redisClPortSlave' type='number' description="Port d'écoute du service Cluster Redis"/>
             <variable name='redisMaxMemorySlave' type='number' description="Quantité de mémoire utilisable par Redis en Mo">
                 <value>512</value>
@@ -152,6 +158,15 @@
         <condition name='disabled_if_in' source='redisMode'>
             <param>Local avec slave distant</param>
             <target type='variable'>redisRole</target>
+            <target type='variable'>redisSlaveInstanceName</target>
+            <target type='variable'>redisSlaveInstanceMaster</target>
+            <target type='variable'>redisClPortSlave</target>
+        </condition>
+
+        <condition name='disabled_if_not_in' source='redisMode'>
+            <param>Local avec slave distant</param>
+            <target type='variable'>redisMasterIPSlave</target>
+            <target type='variable'>redisMasterPortSlave</target>
         </condition>
 
         <condition name='disabled_if_in' source='redisRole'>
diff --git a/tmpl/redis-slave.conf b/tmpl/redis-slave.conf
index 0bd2772..e2850d2 100644
--- a/tmpl/redis-slave.conf
+++ b/tmpl/redis-slave.conf
@@ -83,6 +83,12 @@ protected-mode no
 # If port 0 is specified Redis will not listen on a TCP socket.
 port %%redisPortSlave
 
+%if %%redisMode == 'Local avec slave distant'
+
+slaveof %%redisMasterIPSlave redisMasterPortSlave
+
+%endif
+
 # TCP listen() backlog.
 #
 # In high requests-per-second environments you need an high backlog in order