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

debian/eole-redis.redis2-server.service

@@ -1 +0,0 @@
-../init/redis2-server.service

debian/preinst

@@ -1,35 +0,0 @@
-#!/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,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'/>

init/redis2-server.service

@@ -1,45 +0,0 @@
-[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

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