From e27197a4f07541cb9520ec5be18beb3e687fe576 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Mon, 13 Jun 2022 11:37:58 +0000 Subject: [PATCH] commit 358807fbbbbf1e43bfcec1f24f94bd48e6273ace Merge: 202d8dd76 a319b1745 Author: David Christofas Date: Mon Jun 13 13:35:46 2022 +0200 Merge pull request #3955 from wkloucek/remove-unused-ocs-config-option remove unused `OCS_STORAGE_USERS_DRIVER` configuration option --- extensions/_includes/adoc/ocs_configvars.adoc | 6 ------ extensions/_includes/ocs-config-example.yaml | 1 - extensions/_includes/ocs_configvars.md | 1 - grpc_apis/ocis/messages/search/v0/grpc.md | 2 +- grpc_apis/ocis/messages/settings/v0/grpc.md | 2 +- grpc_apis/ocis/messages/store/v0/grpc.md | 2 +- grpc_apis/ocis/messages/thumbnails/v0/grpc.md | 2 +- grpc_apis/ocis/services/search/v0/grpc.md | 2 +- grpc_apis/ocis/services/settings/v0/grpc.md | 2 +- grpc_apis/ocis/services/store/v0/grpc.md | 2 +- grpc_apis/ocis/services/thumbnails/v0/grpc.md | 2 +- 11 files changed, 8 insertions(+), 16 deletions(-) diff --git a/extensions/_includes/adoc/ocs_configvars.adoc b/extensions/_includes/adoc/ocs_configvars.adoc index 3b88e56afc1..36a2daadb8d 100644 --- a/extensions/_includes/adoc/ocs_configvars.adoc +++ b/extensions/_includes/adoc/ocs_configvars.adoc @@ -108,12 +108,6 @@ | cs3 | -|`STORAGE_USERS_DRIVER` + -`OCS_STORAGE_USERS_DRIVER` -| string -| ocis -| - |`OCIS_MACHINE_AUTH_API_KEY` + `OCS_MACHINE_AUTH_API_KEY` | string diff --git a/extensions/_includes/ocs-config-example.yaml b/extensions/_includes/ocs-config-example.yaml index 18d1bfc8433..ae9c7289a60 100644 --- a/extensions/_includes/ocs-config-example.yaml +++ b/extensions/_includes/ocs-config-example.yaml @@ -43,5 +43,4 @@ reva: identity_management: address: https://localhost:9200 account_backend: cs3 -storage_users_driver: ocis machine_auth_api_key: "" diff --git a/extensions/_includes/ocs_configvars.md b/extensions/_includes/ocs_configvars.md index 89303555d44..9af997eb873 100644 --- a/extensions/_includes/ocs_configvars.md +++ b/extensions/_includes/ocs_configvars.md @@ -20,5 +20,4 @@ | REVA_GATEWAY | string | 127.0.0.1:9142 | | | OCIS_URL
OCIS_OIDC_ISSUER
OCS_IDM_ADDRESS | string | https://localhost:9200 | | | OCS_ACCOUNT_BACKEND_TYPE | string | cs3 | | -| STORAGE_USERS_DRIVER
OCS_STORAGE_USERS_DRIVER | string | ocis | | | OCIS_MACHINE_AUTH_API_KEY
OCS_MACHINE_AUTH_API_KEY | string | | | \ No newline at end of file diff --git a/grpc_apis/ocis/messages/search/v0/grpc.md b/grpc_apis/ocis/messages/search/v0/grpc.md index 59992b2a7a3..8cc00f8b873 100644 --- a/grpc_apis/ocis/messages/search/v0/grpc.md +++ b/grpc_apis/ocis/messages/search/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.search.v0" url: /grpc_apis/ocis_messages_search_v0 -date: 2022-06-13T09:14:34Z +date: 2022-06-13T11:37:07Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/messages/settings/v0/grpc.md b/grpc_apis/ocis/messages/settings/v0/grpc.md index 5ea5b56eb82..203d954513b 100644 --- a/grpc_apis/ocis/messages/settings/v0/grpc.md +++ b/grpc_apis/ocis/messages/settings/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.settings.v0" url: /grpc_apis/ocis_messages_settings_v0 -date: 2022-06-13T09:14:34Z +date: 2022-06-13T11:37:07Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/messages/store/v0/grpc.md b/grpc_apis/ocis/messages/store/v0/grpc.md index c096a75b8f1..b6bbc302d4d 100644 --- a/grpc_apis/ocis/messages/store/v0/grpc.md +++ b/grpc_apis/ocis/messages/store/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.store.v0" url: /grpc_apis/ocis_messages_store_v0 -date: 2022-06-13T09:14:34Z +date: 2022-06-13T11:37:07Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/messages/thumbnails/v0/grpc.md b/grpc_apis/ocis/messages/thumbnails/v0/grpc.md index 786e08de2cf..98b6021e8aa 100644 --- a/grpc_apis/ocis/messages/thumbnails/v0/grpc.md +++ b/grpc_apis/ocis/messages/thumbnails/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.messages.thumbnails.v0" url: /grpc_apis/ocis_messages_thumbnails_v0 -date: 2022-06-13T09:14:34Z +date: 2022-06-13T11:37:07Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/search/v0/grpc.md b/grpc_apis/ocis/services/search/v0/grpc.md index 0fcca2ef10f..19e38160cc1 100644 --- a/grpc_apis/ocis/services/search/v0/grpc.md +++ b/grpc_apis/ocis/services/search/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.search.v0" url: /grpc_apis/ocis_services_search_v0 -date: 2022-06-13T09:14:34Z +date: 2022-06-13T11:37:07Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/settings/v0/grpc.md b/grpc_apis/ocis/services/settings/v0/grpc.md index 2d8550ddb1c..7134a1fbd6a 100644 --- a/grpc_apis/ocis/services/settings/v0/grpc.md +++ b/grpc_apis/ocis/services/settings/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.settings.v0" url: /grpc_apis/ocis_services_settings_v0 -date: 2022-06-13T09:14:34Z +date: 2022-06-13T11:37:07Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/store/v0/grpc.md b/grpc_apis/ocis/services/store/v0/grpc.md index 2fb8cb78dec..0635fb311d0 100644 --- a/grpc_apis/ocis/services/store/v0/grpc.md +++ b/grpc_apis/ocis/services/store/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.store.v0" url: /grpc_apis/ocis_services_store_v0 -date: 2022-06-13T09:14:34Z +date: 2022-06-13T11:37:07Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis --- diff --git a/grpc_apis/ocis/services/thumbnails/v0/grpc.md b/grpc_apis/ocis/services/thumbnails/v0/grpc.md index 039ad6a44b5..5b1ba947fa8 100644 --- a/grpc_apis/ocis/services/thumbnails/v0/grpc.md +++ b/grpc_apis/ocis/services/thumbnails/v0/grpc.md @@ -1,7 +1,7 @@ --- title: "ocis.services.thumbnails.v0" url: /grpc_apis/ocis_services_thumbnails_v0 -date: 2022-06-13T09:14:34Z +date: 2022-06-13T11:37:07Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis ---