Merge branch '2.7.2/master' into dist/eole/2.7.2/master

Redis cluster needs 6 hosts for work ... it's a lot.
To trick him each node can be Master and slave for another node.

;)

Makefile

@@ -4,8 +4,8 @@
 
 SOURCE=eole-redis
 VERSION=0.0.1
-EOLE_VERSION=2.6
+EOLE_VERSION=2.7
-EOLE_RELEASE=2.6.2
+EOLE_RELEASE=2.7.2
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>
 

README.md

@@ -1,5 +1,3 @@
 # eole-redis
 
 Redis EOLE integration
-
-## To fix :

debian/preinst

@@ -0,0 +1,35 @@
+#!/bin/sh
+# preinst script for eole-redis
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    install|upgrade)
+        deb-systemd-helper mask redis-server.service
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

dicos/90_redis.xml

@@ -2,11 +2,12 @@
 <creole>
     <files>
         <!-- System configuration -->
+        <file filelist='redis' name='/etc/sysctl.d/100-redis-tuning.conf' source='redis_sysctl.conf' mkdir='True' rm='True'/>
         <file filelist='redis' name='/etc/redis/redis.conf' mkdir='True' rm='True'/>
         <file filelist='redisSlave' name='/etc/redis/redis-slave.conf' mkdir='True' rm='True'/>
         <file filelist='redisCl' name='/etc/redis/cluster.conf' source='redis-cluster.conf' mkdir='True' rm='True'/>
         <service servicelist="svredis">redis-server</service>
-        <!--service servicelist="svredisSlave">redis2-server</service -->
+        <service servicelist="svredisSlave">redis2-server</service>
         <service_access service='redis-server'>
             <port service_accesslist='saRedis' protocol='tcp' port_type='SymLinkOption'>redisPort</port>
             <port service_accesslist='saRedis' protocol='tcp' port_type='SymLinkOption'>redisClPort</port>
@@ -243,35 +244,18 @@
             <param>slave</param>
         </auto>
 
-        <fill name='intAdd' target='rdClMemberSlavePort'>
-            <param type='eole' name='num1'>rdClMemberPort</param>
-            <param name='num2'>2000</param>
-        </fill>
-
         <fill name='calc_val' target='redisInstanceName'>
             <param type='eole' name='valeur'>nom_machine</param>
         </fill>
 
-        <fill name='intAdd' target='redisClPort'>
-            <param type='eole' name='num1'>redisPort</param>
-            <param name='num2'>10000</param>
-        </fill>
-
-        <fill name='intAdd' target='redisPortSlave'>
-            <param type='eole' name='num1'>redisPort</param>
-            <param name='num2'>2000</param>
-        </fill>
-
-        <fill name='intAdd' target='redisClPortSlave'>
-            <param type='eole' name='num1'>redisPortSlave</param>
-            <param name='num2'>10000</param>
-        </fill>
         <fill name='calc_val' target='redisMaxMemorySlave'>
             <param type='eole' name='valeur'>redisMaxMemory</param>
         </fill>
+
         <fill name='calc_val' target='redisMemoryPolicySlave'>
             <param type='eole' name='valeur'>redisMemoryPolicy</param>
         </fill>
+        
         <fill name='calc_val' target='redisTCPKeepAliveSlave'>
             <param type='eole' name='valeur'>redisTCPKeepAlive</param>
         </fill>

init/redis2-server.service

@@ -0,0 +1,45 @@
+[Unit]
+Description=Advanced key-value store instance 2
+After=network.target
+Documentation=http://redis.io/documentation, man:redis-server(1)
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/redis-server /etc/redis/redis-slave.conf
+PIDFile=/var/run/redis/redis-slave-server.pid
+TimeoutStopSec=0
+Restart=always
+User=redis
+Group=redis
+RuntimeDirectory=redis
+RuntimeDirectoryMode=2755
+
+UMask=007
+PrivateTmp=yes
+LimitNOFILE=65535
+PrivateDevices=yes
+ProtectHome=yes
+ReadOnlyDirectories=/
+ReadWriteDirectories=-/var/lib/redis
+ReadWriteDirectories=-/var/log/redis
+ReadWriteDirectories=-/var/run/redis
+
+NoNewPrivileges=true
+CapabilityBoundingSet=CAP_SETGID CAP_SETUID CAP_SYS_RESOURCE
+MemoryDenyWriteExecute=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectControlGroups=true
+RestrictRealtime=true
+RestrictNamespaces=true
+RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
+
+# redis-server can write to its own config file when in cluster mode so we
+# permit writing there by default. If you are not using this feature, it is
+# recommended that you replace the following lines with "ProtectSystem=full".
+ProtectSystem=true
+ReadWriteDirectories=-/etc/redis
+
+[Install]
+WantedBy=multi-user.target
+Alias=redis2.service

tmpl/redis_sysctl.conf

@@ -0,0 +1,2 @@
+
+net.core.somaxconn = 512