From 6f065b6d40929e06f50e95a410b9137bff42f20e Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 14 Feb 2023 08:42:56 +0000 Subject: [PATCH] commit 93c28445851030066b338c461de61cb70db12cb7 Merge: 6a10559e2 13365f8c7 Author: Phil Davis Date: Tue Feb 14 14:22:35 2023 +0545 Merge pull request #5561 from owncloud/forward-port-share=permission-CoreApiSharePublicLink3 [tests-only][full-ci]Forward-port refactor share permission related scenario --- .../_includes/adoc/global_configvars.adoc | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/services/_includes/adoc/global_configvars.adoc b/services/_includes/adoc/global_configvars.adoc index df3bf7554c7..3a5cebdf2fa 100644 --- a/services/_includes/adoc/global_configvars.adoc +++ b/services/_includes/adoc/global_configvars.adoc @@ -26,7 +26,7 @@ a| [subs=-attributes] ++false ++ a| [subs=-attributes] -Flag to enable or disable the creation of the demo users. +The default role assignments the demo users should be setup. a| `LDAP_BIND_DN` @@ -41,7 +41,7 @@ a| [subs=-attributes] ++string ++ a| [subs=-attributes] -++uid=libregraph,ou=sysusers,o=libregraph-idm ++ +++uid=reva,ou=sysusers,o=libregraph-idm ++ a| [subs=-attributes] LDAP DN to use for simple bind authentication with the target LDAP server. @@ -131,7 +131,7 @@ a| [subs=-attributes] ++groupOfNames ++ a| [subs=-attributes] -The object class to use for groups in the default group search filter ('groupOfNames'). +The object class to use for groups in the default group search filter like 'groupOfNames'. a| `LDAP_GROUP_SCHEMA_DISPLAYNAME` @@ -178,10 +178,10 @@ a| [subs=-attributes] ++string ++ a| [subs=-attributes] -++owncloudUUID ++ +++ownclouduuid ++ a| [subs=-attributes] -LDAP Attribute to use as the unique id for groups. This should be a stable globally unique ID like a UUID. +LDAP Attribute to use as the unique ID for groups. This should be a stable globally unique ID like a UUID. a| `LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING` @@ -246,7 +246,7 @@ a| [subs=-attributes] ++sub ++ a| [subs=-attributes] -LDAP search scope to use when looking up groups. Supported scopes are 'base', 'one' and 'sub'. +LDAP search scope to use when looking up groups. Supported values are 'base', 'one' and 'sub'. a| `LDAP_INSECURE` @@ -336,7 +336,7 @@ a| [subs=-attributes] ++inetOrgPerson ++ a| [subs=-attributes] -The object class to use for users in the default user search filter ('inetOrgPerson'). +The object class to use for users in the default user search filter like 'inetOrgPerson'. a| `LDAP_USER_SCHEMA_DISPLAYNAME` @@ -367,10 +367,10 @@ a| [subs=-attributes] ++string ++ a| [subs=-attributes] -++owncloudUUID ++ +++ownclouduuid ++ a| [subs=-attributes] -LDAP Attribute to use as the unique ID for users. This should be a stable globally unique ID like a UUID. +LDAP Attribute to use as the unique id for users. This should be a stable globally unique id like a UUID. a| `LDAP_USER_SCHEMA_ID_IS_OCTETSTRING` @@ -440,7 +440,7 @@ a| [subs=-attributes] ++sub ++ a| [subs=-attributes] -LDAP search scope to use when looking up users. Supported scopes are 'base', 'one' and 'sub'. +LDAP search scope to use when looking up users. Supported values are 'base', 'one' and 'sub'. a| `OCIS_ADMIN_USER_ID` @@ -467,13 +467,13 @@ a| [subs=attributes+] * xref:{s-path}/storage-users.adoc[storage-users] + a| [subs=-attributes] -++string ++ +++[]string ++ a| [subs=-attributes] -++ ++ +++[] ++ a| [subs=-attributes] -A comma-separated list of addresses to connect to. Only valid if the above setting is set to "etcd" +Node addresses to use for the cache store. a| `OCIS_CACHE_STORE_SIZE` @@ -502,10 +502,10 @@ a| [subs=-attributes] ++string ++ a| [subs=-attributes] -++ ++ +++memory ++ a| [subs=-attributes] -The type of the cache store. Valid options are "noop", "ocmem", "etcd" and "memory" +Store implementation for the cache. Valid values are "memory" (default), "redis", and "etcd". a| `OCIS_CORS_ALLOW_CREDENTIALS` @@ -538,7 +538,7 @@ a| [subs=-attributes] ++[]string ++ a| [subs=-attributes] -++[Origin Accept Content-Type Depth Authorization Ocs-Apirequest If-None-Match If-Match Destination Overwrite X-Request-Id X-Requested-With Tus-Resumable Tus-Checksum-Algorithm Upload-Concat Upload-Length Upload-Metadata Upload-Defer-Length Upload-Expires Upload-Checksum Upload-Offset X-HTTP-Method-Override] ++ +++[Authorization Origin Content-Type Accept X-Requested-With] ++ a| [subs=-attributes] A comma-separated list of allowed CORS headers. See following chapter for more details: *Access-Control-Request-Headers* at \https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Headers. @@ -556,7 +556,7 @@ a| [subs=-attributes] ++[]string ++ a| [subs=-attributes] -++[OPTIONS HEAD GET PUT POST DELETE MKCOL PROPFIND PROPPATCH MOVE COPY REPORT SEARCH] ++ +++[GET POST PUT PATCH DELETE OPTIONS] ++ a| [subs=-attributes] A comma-separated list of allowed CORS methods. See following chapter for more details: *Access-Control-Request-Method* at \https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Method @@ -857,7 +857,7 @@ a| [subs=-attributes] ++false ++ a| [subs=-attributes] -Allow insecure connections to the OIDC issuer. +Whether to verify the server TLS certificates. a| `OCIS_JWT_SECRET` @@ -1086,7 +1086,7 @@ a| [subs=-attributes] ++ ++ a| [subs=-attributes] -The machine auth API key used to validate internal requests necessary to access resources from other services. +Machine auth API key used to validate internal requests necessary to access resources from other services. a| `OCIS_OIDC_ISSUER` @@ -1107,7 +1107,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` @@ -1351,10 +1351,10 @@ a| [subs=-attributes] ++string ++ a| [subs=-attributes] -++https://localhost:9200/ ++ +++https://localhost:9200 ++ a| [subs=-attributes] -Base url to navigate back from the app the containing folder in the file list. +The public facing URL of the oCIS frontend. a| `REVA_GATEWAY` @@ -1404,7 +1404,7 @@ a| [subs=-attributes] ++ ++ a| [subs=-attributes] -Transfer secret for signing file up- and download requests. +The storage transfer secret. a| `STORAGE_USERS_OCIS_ASYNC_UPLOADS`