From 0ab3eb3d90a31b945ab7a176d96f2d056da7bc90 Mon Sep 17 00:00:00 2001 From: AT-SGAI-CSIC <139878963+AT-SGAI-CSIC@users.noreply.github.com> Date: Tue, 7 May 2024 13:19:43 +0200 Subject: [PATCH 1/2] Update caching_configuration.rst Missing comma in config redis cluster Signed-off-by: AT-SGAI-CSIC <139878963+AT-SGAI-CSIC@users.noreply.github.com> --- admin_manual/configuration_server/caching_configuration.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin_manual/configuration_server/caching_configuration.rst b/admin_manual/configuration_server/caching_configuration.rst index d7fd11ef286..89511973957 100644 --- a/admin_manual/configuration_server/caching_configuration.rst +++ b/admin_manual/configuration_server/caching_configuration.rst @@ -198,13 +198,13 @@ The following options are available to configure when using a redis cluster (all 'cache-cluster:7004', 'cache-cluster:7005' ], - 'failover_mode' => \RedisCluster::FAILOVER_ERROR + 'failover_mode' => \RedisCluster::FAILOVER_ERROR, 'timeout' => 0.0, 'read_timeout' => 0.0, 'user' => 'nextcloud', 'password' => 'password', 'dbindex' => 0, - ] + ], .. note:: The port is required as part of the server URL. However, it is not necesarry to list all servers: for example, if all servers are load balanced via the same DNS name, only that server name is required. From 47854bb8edf89ae1375aa9590b664fdadf68885a Mon Sep 17 00:00:00 2001 From: AT-SGAI-CSIC <139878963+AT-SGAI-CSIC@users.noreply.github.com> Date: Wed, 8 May 2024 08:31:43 +0200 Subject: [PATCH 2/2] Update caching_configuration.rst Add some comma Signed-off-by: AT-SGAI-CSIC <139878963+AT-SGAI-CSIC@users.noreply.github.com> --- .../caching_configuration.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/admin_manual/configuration_server/caching_configuration.rst b/admin_manual/configuration_server/caching_configuration.rst index 89511973957..1b0bd19cd0d 100644 --- a/admin_manual/configuration_server/caching_configuration.rst +++ b/admin_manual/configuration_server/caching_configuration.rst @@ -77,7 +77,7 @@ Use APCu for local cache and either Redis cluster ...:: 'cache-cluster:7000', 'cache-cluster:7001', ], - ] + ], ... or Memcached cluster ...:: @@ -182,7 +182,7 @@ The following options are available to configure when using a single redis serve 'dbindex' => 0, 'timeout' => 1.5, 'read_timeout' => 1.5, - ] + ], The following options are available to configure when using a redis cluster (all but ``seeds`` are optional):: @@ -229,9 +229,9 @@ To connect via TCP over TLS, add the following configuration:: 'local_cert' => '/certs/redis.crt', 'local_pk' => '/certs/redis.key', 'cafile' => '/certs/ca.crt', - 'verify_peer_name' => false - ] - ] + 'verify_peer_name' => false, + ], + ], Connecting to Redis cluster over TLS ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -246,9 +246,9 @@ To connect via TCP over TLS, add the following configuration:: 'local_cert' => '/certs/redis.crt', 'local_pk' => '/certs/redis.key', 'cafile' => '/certs/ca.crt', - 'verify_peer_name' => false - ] - ] + 'verify_peer_name' => false, + ], + ], Connecting to single Redis server over UNIX socket ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^