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

debian/eole-redis.redis2-server.service

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

init/redis2-server.service

@@ -1,42 +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
-
-ExecStartPre=-/bin/run-parts --verbose /etc/redis/redis-server.pre-up.d
-ExecStartPost=-/bin/run-parts --verbose /etc/redis/redis-server.post-up.d
-ExecStop=-/bin/run-parts --verbose /etc/redis/redis-server.pre-down.d
-ExecStop=/bin/kill -s TERM $MAINPID
-ExecStopPost=-/bin/run-parts --verbose /etc/redis/redis-server.post-down.d
-
-UMask=007
-PrivateTmp=yes
-LimitNOFILE=65535
-PrivateDevices=yes
-ProtectHome=yes
-ReadOnlyDirectories=/
-ReadWriteDirectories=-/var/lib/redis
-ReadWriteDirectories=-/var/log/redis
-ReadWriteDirectories=-/var/run/redis
-CapabilityBoundingSet=~CAP_SYS_PTRACE
-
-# 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-slave.conf

@@ -326,7 +326,7 @@ maxclients %%redisMaxClients
 # limit for maxmemory so that there is some free RAM on the system for slave
 # output buffers (but this is not needed if the policy is 'noeviction').
 #
-maxmemory %{redisMaxMemory}mb
+maxmemory %%{redisMaxMemory}mb
 
 # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
 # is reached. You can select among five behaviors:

tmpl/redis.conf

@@ -320,7 +320,7 @@ maxclients %%redisMaxClients
 # limit for maxmemory so that there is some free RAM on the system for slave
 # output buffers (but this is not needed if the policy is 'noeviction').
 #
-maxmemory %{redisMaxMemory}mb
+maxmemory %%{redisMaxMemory}mb
 
 # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
 # is reached. You can select among five behaviors: