Skip to content

Commit

Permalink
commit 7177c41
Browse files Browse the repository at this point in the history
Merge: 249adc7 65d11ef
Author: Prarup Gurung <grgprarup@users.noreply.github.com>
Date:   Thu Mar 9 16:27:31 2023 +0545

    Merge pull request #5777 from owncloud/forward-port-remove-isTestingOnOcisOrReva

    [full-ci] [tests-only] Remove `isTestingOnOcisOrReva`
  • Loading branch information
grgprarup committed Mar 9, 2023
1 parent 5be7759 commit 58bdfcd
Showing 1 changed file with 24 additions and 24 deletions.
48 changes: 24 additions & 24 deletions services/_includes/adoc/global_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -41,7 +41,7 @@ a| [subs=-attributes]
++string ++

a| [subs=-attributes]
++uid=idp,ou=sysusers,o=libregraph-idm ++
++uid=libregraph,ou=sysusers,o=libregraph-idm ++

a| [subs=-attributes]
LDAP DN to use for simple bind authentication with the target LDAP server.
Expand Down Expand Up @@ -80,7 +80,7 @@ a| [subs=-attributes]
++~/.ocis/idm/ldap.crt ++

a| [subs=-attributes]
Path/File name for the root CA certificate (in PEM format) used to validate TLS server certificates of the LDAP service. If not definied, the root directory derives from $OCIS_BASE_DATA_PATH:/idp.
Path/File name for the root CA certificate (in PEM format) used to validate TLS server certificates of the LDAP service. If not definied, the root directory derives from $OCIS_BASE_DATA_PATH:/idm.

a| `LDAP_DISABLED_USERS_GROUP_DN`

Expand Down Expand Up @@ -314,7 +314,7 @@ a| [subs=-attributes]
++ldaps://localhost:9235 ++

a| [subs=-attributes]
Url of the LDAP service to use as IDP.
URI of the LDAP Server to connect to. Supported URI schemes are 'ldaps://' and 'ldap://'

a| `LDAP_USER_BASE_DN`

Expand Down Expand Up @@ -385,7 +385,7 @@ a| [subs=-attributes]
++inetOrgPerson ++

a| [subs=-attributes]
LDAP User ObjectClass like 'inetOrgPerson'.
The object class to use for users in the default user search filter ('inetOrgPerson').

a| `LDAP_USER_SCHEMA_DISPLAYNAME`

Expand Down Expand Up @@ -416,10 +416,10 @@ a| [subs=-attributes]
++string ++

a| [subs=-attributes]
++uid ++
++owncloudUUID ++

a| [subs=-attributes]
LDAP User uuid attribute like 'uid'.
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`

Expand All @@ -435,7 +435,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
Set this to true if the defined 'id' attribute for users is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the user ID's.
Set this to true if the defined 'id' attribute for users is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the user id's.

a| `LDAP_USER_SCHEMA_MAIL`

Expand All @@ -453,7 +453,7 @@ a| [subs=-attributes]
++mail ++

a| [subs=-attributes]
LDAP User email attribute like 'mail'.
LDAP Attribute to use for the email address of users.

a| `LDAP_USER_SCHEMA_USERNAME`

Expand All @@ -468,10 +468,10 @@ a| [subs=-attributes]
++string ++

a| [subs=-attributes]
++displayName ++
++uid ++

a| [subs=-attributes]
LDAP User name attribute like 'displayName'.
LDAP Attribute to use for username of users.

a| `LDAP_USER_SCOPE`

Expand Down Expand Up @@ -517,13 +517,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 access the configured store. This has no effect when the 'memory' store is configured. Note that the behaviour how addresses are used is dependent on the library of the configured store.
A comma-separated list of addresses to connect to. Only valid if the above setting is set to "etcd"

a| `OCIS_CACHE_STORE_SIZE`

Expand Down Expand Up @@ -553,10 +553,10 @@ a| [subs=-attributes]
++string ++

a| [subs=-attributes]
++memory ++
++ ++

a| [subs=-attributes]
Store implementation for the cache. Supported values are 'memory' (default), 'redis', 'redis-sentinel', 'nats-js', 'etcd' and 'noop'. See the text description for details.
The type of the cache store. Valid options are "noop", "ocmem", "etcd" and "memory"

a| `OCIS_CORS_ALLOW_CREDENTIALS`

Expand Down Expand Up @@ -591,7 +591,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.
Expand All @@ -610,7 +610,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
Expand Down Expand Up @@ -1067,7 +1067,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
Machine auth API key used to validate internal requests necessary for the access to resources from other services.
Machine auth API key used to validate internal requests necessary to access resources from other services.

a| `OCIS_OIDC_ISSUER`

Expand All @@ -1088,7 +1088,7 @@ a| [subs=-attributes]
++https://localhost:9200 ++

a| [subs=-attributes]
The OIDC issuer URL to use.
URL of the OIDC issuer. It defaults to URL of the builtin IDP.

a| `OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD`

Expand All @@ -1103,7 +1103,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
Set this to true if you want to enforce passwords on Uploader, Editor or Contributor shares.
Set this to true if you want to enforce passwords on Uploader, Editor or Contributor shares. If not using the global OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD, you must define the FRONTEND_OCS_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD in the frontend service.

a| `OCIS_SPACES_MAX_QUOTA`

Expand Down Expand Up @@ -1156,7 +1156,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
ID of the oCIS storage-system system user. Admins need to set the ID for the STORAGE-SYSTEM system user in this config option which is then used to reference the user. Any reasonable long string is possible, preferably this would be an UUIDv4 format.
ID of the oCIS STORAGE-SYSTEM system user. Admins need to set the ID for the STORAGE-SYSTEM system user in this config option which is then used to reference the user. Any reasonable long string is possible, preferably this would be an UUIDv4 format.

a| `OCIS_SYSTEM_USER_IDP`

Expand Down Expand Up @@ -1365,7 +1365,7 @@ a| [subs=-attributes]
++https://localhost:9200 ++

a| [subs=-attributes]
The OIDC issuer URL to use.
The public facing URL of WebDAV.

a| `REVA_GATEWAY`

Expand Down Expand Up @@ -1416,7 +1416,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`

Expand Down

0 comments on commit 58bdfcd

Please sign in to comment.