Skip to content

Commit

Permalink
users: fixup LDAP_BIND_PASSWORD
Browse files Browse the repository at this point in the history
LDAP_BIND_PASSWORD was accidently removed in previous commit

Partial: #7176
(cherry picked from commit 8f262c1)
  • Loading branch information
rhafer committed Sep 21, 2023
1 parent 6ddd4e8 commit ed1a8a2
Show file tree
Hide file tree
Showing 74 changed files with 159 additions and 105 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-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the antivirus service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion 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-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the app-provider service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion 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-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the app-registry service
[width="100%",cols="~,~,~,~",options="header"]
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-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the audit service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
14 changes: 10 additions & 4 deletions services/_includes/adoc/auth-basic_configvars.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// set the attribute to true or leave empty, true without any quotes.

:show-deprecation: false
:show-deprecation: true

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

[#deprecation-note-2023-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the auth-basic service
[width="100%",cols="~,~,~,~",options="header"]
Expand All @@ -13,6 +13,11 @@ ifeval::[{show-deprecation} == true]
| Deprecation Version
| Removal Version
| Deprecation Replacement

| LDAP_BIND_PASSWORD changing name for consistency
| 4.0.2
| 5.0.0
| OCIS_LDAP_BIND_PASSWORD
|===

endif::[]
Expand Down Expand Up @@ -255,9 +260,10 @@ a| [subs=-attributes]
a| [subs=-attributes]
LDAP DN to use for simple bind authentication with the target LDAP server.

a|`LDAP_BIND_PASSWORD` +
a|`OCIS_LDAP_BIND_PASSWORD` +
`LDAP_BIND_PASSWORD` +
`AUTH_BASIC_LDAP_BIND_PASSWORD` +

xref:deprecation-note-2023-09-21-14-56-12[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-basic_deprecation.adoc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
:show-deprecation: false
:show-deprecation: true

2 changes: 1 addition & 1 deletion 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-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the auth-bearer service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion 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-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the auth-machine service
[width="100%",cols="~,~,~,~",options="header"]
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-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the eventhistory service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion 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-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the frontend service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/gateway_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-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the gateway service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
48 changes: 33 additions & 15 deletions services/_includes/adoc/global_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ a| [subs=-attributes]
++0 ++

a| [subs=-attributes]
Max number of entries to hold in the cache.
The maximum quantity of items in the cache. Only applies when store type 'ocmem' is configured. Defaults to 512.

a| `OCIS_CACHE_STORE`

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

a| [subs=-attributes]
Set this option to 'true' to disable rendering of thumbnails triggered via webdav access. Note that when disabled, all access to preview related webdav paths will return a 404.
Set this option to 'true' to disable previews in all the different web file listing views. This can speed up file listings in folders with many files. The only list view that is not affected by this setting is the trash bin, as it does not allow previewing at all.

a| `OCIS_EDITION`

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

a| [subs=-attributes]
The root CA certificate used to validate the server's TLS certificate. If provided AUDIT_EVENTS_TLS_INSECURE will be seen as false.
The root CA certificate used to validate the server's TLS certificate. If provided NOTIFICATIONS_EVENTS_TLS_INSECURE will be seen as false.

a| `OCIS_GRPC_CLIENT_TLS_CACERT`

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

a| [subs=-attributes]
Whether to verify the server TLS certificates.
Allow insecure connections to the OIDC issuer.

a| `OCIS_JWT_SECRET`

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

a| [subs=-attributes]
The client ID to authenticate with keycloak.
The client id to authenticate with keycloak.

a| `OCIS_KEYCLOAK_CLIENT_REALM`

Expand Down Expand Up @@ -765,6 +765,24 @@ a| [subs=-attributes]
a| [subs=-attributes]
LDAP DN to use for simple bind authentication with the target LDAP server.

a| `OCIS_LDAP_BIND_PASSWORD`

a| [subs=attributes+]
* xref:{s-path}/auth-basic.adoc[auth-basic] +
* xref:{s-path}/graph.adoc[graph] +
* xref:{s-path}/groups.adoc[groups] +
* xref:{s-path}/idp.adoc[idp] +
* xref:{s-path}/users.adoc[users] +

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

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

a| [subs=-attributes]
Password to use for authenticating the 'bind_dn'.

a| `OCIS_LDAP_CACERT`

a| [subs=attributes+]
Expand Down Expand Up @@ -864,7 +882,7 @@ a| [subs=-attributes]
++groupOfNames ++

a| [subs=-attributes]
The object class to use for groups in the default group search filter like 'groupOfNames'.
The object class to use for groups in the default group search filter ('groupOfNames').

a| `OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME`

Expand Down Expand Up @@ -914,7 +932,7 @@ a| [subs=-attributes]
++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 (e.g. a UUID).

a| `OCIS_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING`

Expand All @@ -931,7 +949,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 ID's.
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.

a| `OCIS_LDAP_GROUP_SCHEMA_MAIL`

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

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

a| `OCIS_LDAP_USER_SCHEMA_DISPLAYNAME`

Expand Down Expand Up @@ -1154,7 +1172,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 IDs.

a| `OCIS_LDAP_USER_SCHEMA_MAIL`

Expand Down Expand Up @@ -1442,7 +1460,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 for the access to resources from other services.

a| `OCIS_OIDC_ISSUER`

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

a| [subs=-attributes]
The identity provider href for the openid-discovery relation.
URL of the OIDC issuer. It defaults to URL of the builtin IDP.

a| `OCIS_PERSISTENT_STORE`

Expand Down Expand Up @@ -1632,7 +1650,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 @@ -1857,7 +1875,7 @@ a| [subs=-attributes]
++ ++

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

a| `OCIS_URL`

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

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

a| `STORAGE_USERS_ASYNC_PROPAGATOR_PROPAGATION_DELAY`

Expand Down
14 changes: 10 additions & 4 deletions services/_includes/adoc/graph_configvars.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// set the attribute to true or leave empty, true without any quotes.

:show-deprecation: false
:show-deprecation: true

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

[#deprecation-note-2023-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the graph service
[width="100%",cols="~,~,~,~",options="header"]
Expand All @@ -13,6 +13,11 @@ ifeval::[{show-deprecation} == true]
| Deprecation Version
| Removal Version
| Deprecation Replacement

| LDAP_BIND_PASSWORD changing name for consistency
| 4.0.2
| 5.0.0
| OCIS_LDAP_BIND_PASSWORD
|===

endif::[]
Expand Down Expand Up @@ -480,9 +485,10 @@ a| [subs=-attributes]
a| [subs=-attributes]
LDAP DN to use for simple bind authentication with the target LDAP server.

a|`LDAP_BIND_PASSWORD` +
a|`OCIS_LDAP_BIND_PASSWORD` +
`LDAP_BIND_PASSWORD` +
`GRAPH_LDAP_BIND_PASSWORD` +

xref:deprecation-note-2023-09-21-14-56-12[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/graph_deprecation.adoc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
:show-deprecation: false
:show-deprecation: true

14 changes: 10 additions & 4 deletions services/_includes/adoc/groups_configvars.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// set the attribute to true or leave empty, true without any quotes.

:show-deprecation: false
:show-deprecation: true

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

[#deprecation-note-2023-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the groups service
[width="100%",cols="~,~,~,~",options="header"]
Expand All @@ -13,6 +13,11 @@ ifeval::[{show-deprecation} == true]
| Deprecation Version
| Removal Version
| Deprecation Replacement

| LDAP_BIND_PASSWORD changing name for consistency
| 4.0.2
| 5.0.0
| OCIS_LDAP_BIND_PASSWORD
|===

endif::[]
Expand Down Expand Up @@ -255,9 +260,10 @@ a| [subs=-attributes]
a| [subs=-attributes]
LDAP DN to use for simple bind authentication with the target LDAP server.

a|`LDAP_BIND_PASSWORD` +
a|`OCIS_LDAP_BIND_PASSWORD` +
`LDAP_BIND_PASSWORD` +
`GROUPS_LDAP_BIND_PASSWORD` +

xref:deprecation-note-2023-09-21-14-56-12[Deprecation Note]
a| [subs=-attributes]
++string ++
a| [subs=-attributes]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/groups_deprecation.adoc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
:show-deprecation: false
:show-deprecation: true

2 changes: 1 addition & 1 deletion services/_includes/adoc/idm_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-09-21-05-59-30]
[#deprecation-note-2023-09-21-14-56-12]
[caption=]
.Deprecation notes for the idm service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
Loading

0 comments on commit ed1a8a2

Please sign in to comment.