From fb99a14b8a0c79caa90cf8ac2bd32707414dea5c Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 13 Feb 2023 00:13:12 +0000 Subject: [PATCH] commit b68914b5217f8a53192fb343f9718db787c58c80 Merge: cd804685b 9ddbe9168 Author: Martin Date: Fri Feb 10 13:50:31 2023 +0100 Merge pull request #5549 from kobergj/BackportEnvDescImprovement --- services/_includes/adoc/global_configvars.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/_includes/adoc/global_configvars.adoc b/services/_includes/adoc/global_configvars.adoc index 46f3dbd8a47..2fcafdb9750 100644 --- a/services/_includes/adoc/global_configvars.adoc +++ b/services/_includes/adoc/global_configvars.adoc @@ -850,7 +850,7 @@ a| [subs=-attributes] ++false ++ a| [subs=-attributes] -Whether the NATS server should skip the client certificate verification during the TLS handshake. +Whether to verify the server TLS certificates. a| `OCIS_JWT_SECRET` @@ -1092,7 +1092,7 @@ a| [subs=-attributes] ++https://localhost:9200 ++ a| [subs=-attributes] -URL of the OIDC issuer. It defaults to URL of the builtin IDP. +The identity provider value to set in the userids of the CS3 user objects for users returned by this user provider. a| `OCIS_SYSTEM_USER_API_KEY` @@ -1331,10 +1331,10 @@ a| [subs=-attributes] ++string ++ a| [subs=-attributes] -++https://127.0.0.1:9200 ++ +++https://localhost:9200 ++ a| [subs=-attributes] -URL, where oCIS is reachable for users. +The public facing URL of WebDAV. a| `REVA_GATEWAY`