Skip to content

Commit

Permalink
commit 6a10559
Browse files Browse the repository at this point in the history
Merge: 2fec80f 3274361
Author: Phil Davis <[email protected]>
Date:   Tue Feb 14 14:22:11 2023 +0545

    Merge pull request #5490 from owncloud/refactor-share-permission-in-coreApiSharePublicLinkShare

    [full-ci][tests-only]Forward-port refactor share permission in coreApiSharePublicLinkShare
  • Loading branch information
phil-davis committed Feb 14, 2023
1 parent 65746c5 commit ef7e383
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions helpers/extended_vars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ variables:
description: ""
do_ignore: true
- rawname: MICRO_LOG_LEVEL
path: ocis-pkg/log/log.go:31
path: ocis-pkg/log/log.go:35
foundincode: true
name: MICRO_LOG_LEVEL
type: ""
default_value: ""
description: ""
do_ignore: false
- rawname: MICRO_LOG_LEVEL
path: ocis-pkg/log/log.go:35
path: ocis-pkg/log/log.go:31
foundincode: true
name: MICRO_LOG_LEVEL
type: ""
Expand Down
36 changes: 18 additions & 18 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]
The default role assignments the demo users should be setup.
Flag to enable or disable the creation of the demo users.

a| `LDAP_BIND_DN`

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

a| [subs=-attributes]
++uid=reva,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 @@ -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 (e.g. 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`

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

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

a| `LDAP_GROUP_SCHEMA_MAIL`

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

a| [subs=-attributes]
LDAP search scope to use when looking up groups. Supported values are 'base', 'one' and 'sub'.
LDAP search scope to use when looking up groups. Supported scopes are 'base', 'one' and 'sub'.

a| `LDAP_INSECURE`

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

Expand All @@ -386,7 +386,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 IDs.
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 Down Expand Up @@ -440,7 +440,7 @@ a| [subs=-attributes]
++sub ++

a| [subs=-attributes]
LDAP search scope to use when looking up users. Supported values are 'base', 'one' and 'sub'.
LDAP search scope to use when looking up users. Supported scopes are 'base', 'one' and 'sub'.

a| `OCIS_ADMIN_USER_ID`

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

a| [subs=-attributes]
++[Authorization Origin Content-Type Accept X-Requested-With] ++
++[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] ++

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 @@ -556,7 +556,7 @@ a| [subs=-attributes]
++[]string ++

a| [subs=-attributes]
++[GET POST PUT PATCH DELETE OPTIONS] ++
++[OPTIONS HEAD GET PUT POST DELETE MKCOL PROPFIND PROPPATCH MOVE COPY REPORT SEARCH] ++

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 @@ -857,7 +857,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
Whether the NATS server should skip the client certificate verification during the TLS handshake.
Allow insecure connections to the OIDC issuer.

a| `OCIS_JWT_SECRET`

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

a| [subs=-attributes]
The secret to mint and validate JWT tokens.
The secret to mint and validate jwt tokens.

a| `OCIS_LOG_COLOR`

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

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

a| `OCIS_OIDC_ISSUER`

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

a| [subs=-attributes]
++https://localhost:9200 ++
++https://localhost:9200/ ++

a| [subs=-attributes]
URL of the OIDC issuer. It defaults to URL of the builtin IDP.
Base url to navigate back from the app the containing folder in the file list.

a| `REVA_GATEWAY`

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

a| [subs=-attributes]
The storage transfer secret.
Transfer secret for signing file up- and download requests.

a| `STORAGE_USERS_OCIS_ASYNC_UPLOADS`

Expand Down

0 comments on commit ef7e383

Please sign in to comment.