Merge branch 'develop' into dist/eole/2.7.0/develop

désactivation du service redis à l'installation pour cause d'IPv6
2019-03-19 14:58:04 +01:00 · 2019-03-05 10:35:01 +01:00 · 2019-03-05 10:15:04 +01:00 · 2019-03-04 17:36:07 +01:00 · 2019-02-14 11:56:51 +01:00 · 2019-02-14 11:56:39 +01:00
6 changed files with 23 additions and 8 deletions
--- a/4
+++ b/4
@ -4,8 +4,8 @@

 SOURCE=eole-redis
 VERSION=0.0.1
-EOLE_VERSION=2.7
-EOLE_RELEASE=2.7.1
+EOLE_VERSION=2.6
+EOLE_RELEASE=2.6.2
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>

--- a/README.md
+++ b/README.md
@ -1,3 +1,5 @@
 # eole-redis

 Redis EOLE integration
+
+## To fix :
--- a/debian/eole-redis.redis2-server.service
+++ b/debian/eole-redis.redis2-server.service
@ -1 +0,0 @@
-../init/redis2-server.service
--- a/debian/source/.format.un~
+++ b/debian/source/.format.un~
--- a/dicos/90_redis.xml
+++ b/dicos/90_redis.xml
@ -2,7 +2,6 @@
 <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'/>
@ -244,18 +243,35 @@
            <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>
--- a/tmpl/redis_sysctl.conf
+++ b/tmpl/redis_sysctl.conf
@ -1,2 +0,0 @@
-
-net.core.somaxconn = 512
Author	SHA1	Message	Date
Teddy Cornaut	00df1c28ce	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-03-19 14:58:04 +01:00
vincent	2c2326c791	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-03-05 10:35:01 +01:00
vincent	9edb167a21	désactivation du service redis à l'installation pour cause d'IPv6	2019-03-05 10:15:04 +01:00
vincent	75d8c0eb6a	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-03-04 17:36:07 +01:00
Teddy Cornaut	395adf15a5	Merge branch 'develop' into dist/eole/2.7.0/develop	2019-02-14 11:56:51 +01:00
Teddy Cornaut	ac3db1aa60	Fix init	2019-02-14 11:56:39 +01:00