software/{gitlab,nextcloud}: update options to new redis recipe

software/gitlab/buildout.hash.cfg

@@ -54,7 +54,7 @@ md5sum = 0f1ec4077dab586cc003ae13f689eda2
 
 [instance-gitlab.cfg.in]
 _update_hash_filename_ = instance-gitlab.cfg.in
-md5sum = c115c88d5798dcb5e16b9d50432f2551
+md5sum = e0a811e83f8c3de5142e8e8c6fb9fd8c
 
 [instance-gitlab-export.cfg.in]
 _update_hash_filename_ = instance-gitlab-export.cfg.in

software/gitlab/instance-gitlab.cfg.in

@@ -497,19 +497,20 @@ log     = ${directory:log}/redis
 [service-redis]
 recipe  = slapos.cookbook:redis.server
 wrapper = ${directory:service}/redis
-promise_wrapper = ${directory:bin}/redis-promise
+promise-wrapper = ${directory:bin}/redis-promise
 
-server_dir  = ${redis:srv}
-config_file = ${directory:etc}/redis.conf
-log_file    = ${redis:log}/redis.log
-pid_file    = ${directory:run}/redis.pid
-use_passwd  = false
+server-dir  = ${redis:srv}
+config-file = ${directory:etc}/redis.conf
+log-file    = ${redis:log}/redis.log
+pid-file    = ${directory:run}/redis.pid
+use-passwd  = false
 unixsocket  = ${:server_dir}/redis.socket
 # port = 0 means "don't listen on TCP at all" - listen only on unix socket
 ipv6    = ::1
 port    = 0
 
-server_bin  = {{ redis_binprefix }}/redis-server
+server-bin  = {{ redis_binprefix }}/redis-server
+cli-bin  = {{ redis_binprefix }}/redis-cli
 depend  =
     ${logrotate-entry-redis:recipe}
 
@@ -517,9 +518,7 @@ depend  =
 <= monitor-promise-base
 promise = check_command_execute
 name = promise-redis.py
-config-command = ${service-redis:promise_wrapper}
-
-# NOTE slapos.cookbook:redis.server setups promise automatically
+config-command = ${service-redis:promise-wrapper}
 
 [logrotate-entry-redis]
 <= logrotate-entry-base

software/nextcloud/buildout.hash.cfg

@@ -26,4 +26,4 @@ md5sum = 6f42f0a8c5e5c0c657541a65c4d9ee57
 
 [template-nextcloud-instance]
 filename = nextcloud-instance.cfg.in
-md5sum = 495b1693e451f6c5044c67ce5f1194fe
+md5sum = 4426b5e62c61efec2e68e7f548bc6463

software/nextcloud/nextcloud-instance.cfg.in

@@ -12,17 +12,18 @@ backup   = ${directory:backup}/nextcloud
 [service-redis]
 recipe  = slapos.cookbook:redis.server
 wrapper = ${directory:services}/redis
-promise_wrapper = ${directory:bin}/redis-promise
-server_dir  = ${nc-directory:redis}
-config_file = ${directory:etc}/redis.conf
-log_file    = ${nc-directory:redis-log}/redis.log
-pid_file    = ${directory:run}/redis.pid
-use_passwd  = false
-unixsocket  = ${:server_dir}/redis.socket
+promise-wrapper = ${directory:bin}/redis-promise
+server-dir  = ${nc-directory:redis}
+config-file = ${directory:etc}/redis.conf
+log-file    = ${nc-directory:redis-log}/redis.log
+pid-file    = ${directory:run}/redis.pid
+use-passwd  = false
+unixsocket  = ${:server-dir}/redis.socket
 # port = 0 means "don't listen on TCP at all" - listen only on unix socket
 ipv6    = ::1
 port    = 0
-server_bin  = {{ redis_bin }}
+server-bin  = {{ redis_bin }}
+cli-bin  = {{ redis_cli }}
 depend  =
     ${logrotate-entry-redis:recipe}
 
@@ -30,7 +31,7 @@ depend  =
 <= monitor-promise-base
 promise = check_command_execute
 name = redis.py
-config-command = ${service-redis:promise_wrapper}
+config-command = ${service-redis:promise-wrapper}
 
 [logrotate-entry-redis]
 <= logrotate-entry-base