Skip to content

Commit

Permalink
Merge pull request #6840 from owncloud/graceful-timeout
Browse files Browse the repository at this point in the history
storage-users: Add config option for graceful shutdown timeout
  • Loading branch information
mmattel committed Jul 19, 2023
1 parent d6413dc commit 9eb8679
Show file tree
Hide file tree
Showing 66 changed files with 255 additions and 231 deletions.
2 changes: 1 addition & 1 deletion services/_includes/adoc/antivirus_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-07-19-03-49-47]
[#deprecation-note-2023-07-19-14-20-11]
[caption=]
.Deprecation notes for the antivirus service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
4 changes: 2 additions & 2 deletions services/_includes/adoc/app-provider_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-07-19-03-49-47]
[#deprecation-note-2023-07-19-14-20-11]
[caption=]
.Deprecation notes for the app-provider service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -186,7 +186,7 @@ The secret to mint and validate jwt tokens.

a|`OCIS_REVA_GATEWAY` +
`REVA_GATEWAY` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
4 changes: 2 additions & 2 deletions services/_includes/adoc/app-registry_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-07-19-03-49-47]
[#deprecation-note-2023-07-19-14-20-11]
[caption=]
.Deprecation notes for the app-registry service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -177,7 +177,7 @@ The secret to mint and validate jwt tokens.

a|`OCIS_REVA_GATEWAY` +
`REVA_GATEWAY` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/audit_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-07-19-03-49-47]
[#deprecation-note-2023-07-19-14-20-11]
[caption=]
.Deprecation notes for the audit service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
56 changes: 28 additions & 28 deletions services/_includes/adoc/auth-basic_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-07-19-03-49-47]
[#deprecation-note-2023-07-19-14-20-11]
[caption=]
.Deprecation notes for the auth-basic service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -307,7 +307,7 @@ The secret to mint and validate jwt tokens.

a|`OCIS_REVA_GATEWAY` +
`REVA_GATEWAY` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down Expand Up @@ -354,7 +354,7 @@ The authentication manager to check if credentials are valid. Supported value is
a|`OCIS_LDAP_URI` +
`LDAP_URI` +
`AUTH_BASIC_LDAP_URI` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -365,7 +365,7 @@ URI of the LDAP Server to connect to. Supported URI schemes are 'ldaps://' and '
a|`OCIS_LDAP_CACERT` +
`LDAP_CACERT` +
`AUTH_BASIC_LDAP_CACERT` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -376,7 +376,7 @@ Path/File name for the root CA certificate (in PEM format) used to validate TLS
a|`OCIS_LDAP_INSECURE` +
`LDAP_INSECURE` +
`AUTH_BASIC_LDAP_INSECURE` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++bool ++
a| [subs=-attributes]
Expand All @@ -387,7 +387,7 @@ Disable TLS certificate validation for the LDAP connections. Do not set this in
a|`OCIS_LDAP_BIND_DN` +
`LDAP_BIND_DN` +
`AUTH_BASIC_LDAP_BIND_DN` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -408,7 +408,7 @@ Password to use for authenticating the 'bind_dn'.
a|`OCIS_LDAP_USER_BASE_DN` +
`LDAP_USER_BASE_DN` +
`AUTH_BASIC_LDAP_USER_BASE_DN` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -419,7 +419,7 @@ Search base DN for looking up LDAP users.
a|`OCIS_LDAP_GROUP_BASE_DN` +
`LDAP_GROUP_BASE_DN` +
`AUTH_BASIC_LDAP_GROUP_BASE_DN` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -430,7 +430,7 @@ Search base DN for looking up LDAP groups.
a|`OCIS_LDAP_USER_SCOPE` +
`LDAP_USER_SCOPE` +
`AUTH_BASIC_LDAP_USER_SCOPE` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -441,7 +441,7 @@ LDAP search scope to use when looking up users. Supported values are 'base', 'on
a|`OCIS_LDAP_GROUP_SCOPE` +
`LDAP_GROUP_SCOPE` +
`AUTH_BASIC_LDAP_GROUP_SCOPE` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -452,7 +452,7 @@ LDAP search scope to use when looking up groups. Supported values are 'base', 'o
a|`OCIS_LDAP_USER_FILTER` +
`LDAP_USER_FILTER` +
`AUTH_BASIC_LDAP_USER_FILTER` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -463,7 +463,7 @@ LDAP filter to add to the default filters for user search like '(objectclass=own
a|`OCIS_LDAP_GROUP_FILTER` +
`LDAP_GROUP_FILTER` +
`AUTH_BASIC_LDAP_GROUP_FILTER` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -474,7 +474,7 @@ LDAP filter to add to the default filters for group searches.
a|`OCIS_LDAP_USER_OBJECTCLASS` +
`LDAP_USER_OBJECTCLASS` +
`AUTH_BASIC_LDAP_USER_OBJECTCLASS` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -485,7 +485,7 @@ The object class to use for users in the default user search filter ('inetOrgPer
a|`OCIS_LDAP_GROUP_OBJECTCLASS` +
`LDAP_GROUP_OBJECTCLASS` +
`AUTH_BASIC_LDAP_GROUP_OBJECTCLASS` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down Expand Up @@ -517,7 +517,7 @@ The identity provider value to set in the userids of the CS3 user objects for us
a|`OCIS_LDAP_DISABLE_USER_MECHANISM` +
`LDAP_DISABLE_USER_MECHANISM` +
`AUTH_BASIC_DISABLE_USER_MECHANISM` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -528,7 +528,7 @@ An option to control the behavior for disabling users. Valid options are 'none',
a|`OCIS_LDAP_DISABLED_USERS_GROUP_DN` +
`LDAP_DISABLED_USERS_GROUP_DN` +
`AUTH_BASIC_DISABLED_USERS_GROUP_DN` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -539,7 +539,7 @@ The distinguished name of the group to which added users will be classified as d
a|`OCIS_LDAP_USER_SCHEMA_ID` +
`LDAP_USER_SCHEMA_ID` +
`AUTH_BASIC_LDAP_USER_SCHEMA_ID` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -550,7 +550,7 @@ LDAP Attribute to use as the unique ID for users. This should be a stable global
a|`OCIS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING` +
`LDAP_USER_SCHEMA_ID_IS_OCTETSTRING` +
`AUTH_BASIC_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++bool ++
a| [subs=-attributes]
Expand All @@ -561,7 +561,7 @@ Set this to true if the defined 'ID' attribute for users is of the 'OCTETSTRING'
a|`OCIS_LDAP_USER_SCHEMA_MAIL` +
`LDAP_USER_SCHEMA_MAIL` +
`AUTH_BASIC_LDAP_USER_SCHEMA_MAIL` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -572,7 +572,7 @@ LDAP Attribute to use for the email address of users.
a|`OCIS_LDAP_USER_SCHEMA_DISPLAYNAME` +
`LDAP_USER_SCHEMA_DISPLAYNAME` +
`AUTH_BASIC_LDAP_USER_SCHEMA_DISPLAYNAME` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -583,7 +583,7 @@ LDAP Attribute to use for the displayname of users.
a|`OCIS_LDAP_USER_SCHEMA_USERNAME` +
`LDAP_USER_SCHEMA_USERNAME` +
`AUTH_BASIC_LDAP_USER_SCHEMA_USERNAME` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -594,7 +594,7 @@ LDAP Attribute to use for username of users.
a|`OCIS_LDAP_USER_ENABLED_ATTRIBUTE` +
`LDAP_USER_ENABLED_ATTRIBUTE` +
`AUTH_BASIC_LDAP_USER_ENABLED_ATTRIBUTE` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -605,7 +605,7 @@ LDAP attribute to use as a flag telling if the user is enabled or disabled.
a|`OCIS_LDAP_GROUP_SCHEMA_ID` +
`LDAP_GROUP_SCHEMA_ID` +
`AUTH_BASIC_LDAP_GROUP_SCHEMA_ID` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -616,7 +616,7 @@ LDAP Attribute to use as the unique id for groups. This should be a stable globa
a|`OCIS_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING` +
`LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING` +
`AUTH_BASIC_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++bool ++
a| [subs=-attributes]
Expand All @@ -627,7 +627,7 @@ Set this to true if the defined 'id' attribute for groups is of the 'OCTETSTRING
a|`OCIS_LDAP_GROUP_SCHEMA_MAIL` +
`LDAP_GROUP_SCHEMA_MAIL` +
`AUTH_BASIC_LDAP_GROUP_SCHEMA_MAIL` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -638,7 +638,7 @@ LDAP Attribute to use for the email address of groups (can be empty).
a|`OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME` +
`LDAP_GROUP_SCHEMA_DISPLAYNAME` +
`AUTH_BASIC_LDAP_GROUP_SCHEMA_DISPLAYNAME` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -649,7 +649,7 @@ LDAP Attribute to use for the displayname of groups (often the same as groupname
a|`OCIS_LDAP_GROUP_SCHEMA_GROUPNAME` +
`LDAP_GROUP_SCHEMA_GROUPNAME` +
`AUTH_BASIC_LDAP_GROUP_SCHEMA_GROUPNAME` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -660,7 +660,7 @@ LDAP Attribute to use for the name of groups.
a|`OCIS_LDAP_GROUP_SCHEMA_MEMBER` +
`LDAP_GROUP_SCHEMA_MEMBER` +
`AUTH_BASIC_LDAP_GROUP_SCHEMA_MEMBER` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
4 changes: 2 additions & 2 deletions services/_includes/adoc/auth-bearer_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-07-19-03-49-47]
[#deprecation-note-2023-07-19-14-20-11]
[caption=]
.Deprecation notes for the auth-bearer service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -177,7 +177,7 @@ The secret to mint and validate jwt tokens.

a|`OCIS_REVA_GATEWAY` +
`REVA_GATEWAY` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
4 changes: 2 additions & 2 deletions services/_includes/adoc/auth-machine_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-07-19-03-49-47]
[#deprecation-note-2023-07-19-14-20-11]
[caption=]
.Deprecation notes for the auth-machine service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -177,7 +177,7 @@ The secret to mint and validate jwt tokens.

a|`OCIS_REVA_GATEWAY` +
`REVA_GATEWAY` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/eventhistory_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-07-19-03-49-47]
[#deprecation-note-2023-07-19-14-20-11]
[caption=]
.Deprecation notes for the eventhistory service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
8 changes: 4 additions & 4 deletions services/_includes/adoc/frontend_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2023-07-19-03-49-47]
[#deprecation-note-2023-07-19-14-20-11]
[caption=]
.Deprecation notes for the frontend service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -226,7 +226,7 @@ Allow credentials for CORS.See following chapter for more details: *Access-Contr

a|`OCIS_TRANSFER_SECRET` +
`STORAGE_TRANSFER_SECRET` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand All @@ -246,7 +246,7 @@ The secret to mint and validate jwt tokens.

a|`OCIS_REVA_GATEWAY` +
`REVA_GATEWAY` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down Expand Up @@ -478,7 +478,7 @@ Path prefix for shares as part of an ocis resource. Note that the path must star

a|`FRONTEND_OCS_PERSONAL_NAMESPACE` +
`FRONTEND_OCS_HOME_NAMESPACE` +
xref:deprecation-note-2023-07-19-03-49-47[Deprecation Note]
xref:deprecation-note-2023-07-19-14-20-11[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
Loading

0 comments on commit 9eb8679

Please sign in to comment.