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

Ajout conf sysctl
Merge branch 'develop' into dist/eole/2.7.0/master
2019-04-11 11:27:33 +02:00 · 2019-04-11 11:25:40 +02:00 · 2019-03-19 16:03:00 +01:00 · 2019-03-19 13:54:43 +01:00 · 2019-03-19 13:52:33 +01:00
4 changed files with 4 additions and 0 deletions
--- a/debian/eole-redis.redis2-server.service
+++ b/debian/eole-redis.redis2-server.service
@ -0,0 +1 @@
+../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,6 +2,7 @@
 <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'/>
--- a/tmpl/redis_sysctl.conf
+++ b/tmpl/redis_sysctl.conf
@ -0,0 +1,2 @@
+
+net.core.somaxconn = 512
Author	SHA1	Message	Date
Teddy Cornaut	c60d652730	Merge branch 'master' into dist/eole/2.7.0/master	2019-04-11 11:27:33 +02:00
Teddy Cornaut	9bfa3a41f5	Ajout conf sysctl	2019-04-11 11:25:40 +02:00
Teddy Cornaut	80231b48a4	Merge branch 'develop' into dist/eole/2.7.0/master	2019-03-19 16:03:00 +01:00
Teddy Cornaut	c54c397a9e	Report modifications dist develop	2019-03-19 13:54:43 +01:00
Teddy Cornaut	7cadb3da0e	Merge branch 'master' into dist/eole/2.7.0/master	2019-03-19 13:52:33 +01:00