From 8ff1829dbf9148941be73c4f74a4d74d89bc17cd Mon Sep 17 00:00:00 2001 From: Willy Kloucek <34452982+wkloucek@users.noreply.github.com> Date: Mon, 16 May 2022 08:05:11 +0000 Subject: [PATCH] commit 922d1414d87a9cdc962c133b5f1aef82eaf7220f Merge: 008622ede 97220e63e Author: Willy Kloucek <34452982+wkloucek@users.noreply.github.com> Date: Mon May 16 10:02:40 2022 +0200 Merge pull request #3799 from wkloucek/fix-settings-idm-adminuserid fix settings and idm admin user id configuration --- extensions/_includes/adoc/idm_configvars.adoc | 6 ++++++ extensions/_includes/adoc/settings_configvars.adoc | 6 ++++++ extensions/_includes/idm-config-example.yaml | 1 + extensions/_includes/idm_configvars.md | 3 ++- extensions/_includes/settings-config-example.yaml | 1 + extensions/_includes/settings_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 +- 14 files changed, 25 insertions(+), 9 deletions(-) diff --git a/extensions/_includes/adoc/idm_configvars.adoc b/extensions/_includes/adoc/idm_configvars.adoc index c586a32ac6b..396c714fba1 100644 --- a/extensions/_includes/adoc/idm_configvars.adoc +++ b/extensions/_includes/adoc/idm_configvars.adoc @@ -120,6 +120,12 @@ | string | | Password to set for the "idp" service user. Either cleartext or an argon2id hash + +|`OCIS_ADMIN_USER_ID` + +`IDM_ADMIN_USER_ID` +| string +| +| |=== Since Version: `+` added, `-` deprecated diff --git a/extensions/_includes/adoc/settings_configvars.adoc b/extensions/_includes/adoc/settings_configvars.adoc index 8ed219274bd..b07114bd3ae 100644 --- a/extensions/_includes/adoc/settings_configvars.adoc +++ b/extensions/_includes/adoc/settings_configvars.adoc @@ -132,6 +132,12 @@ | | +|`OCIS_ADMIN_USER_ID` + +`SETTINGS_ADMIN_USER_ID` +| string +| +| + |`SETTINGS_ASSET_PATH` | string | diff --git a/extensions/_includes/idm-config-example.yaml b/extensions/_includes/idm-config-example.yaml index 4e024076da9..17b7c2c1a5a 100644 --- a/extensions/_includes/idm-config-example.yaml +++ b/extensions/_includes/idm-config-example.yaml @@ -27,3 +27,4 @@ service_user_passwords: idm_password: "" reva_password: "" idp_password: "" +admin_user_id: "" diff --git a/extensions/_includes/idm_configvars.md b/extensions/_includes/idm_configvars.md index 8f338c6b109..36628998b68 100644 --- a/extensions/_includes/idm_configvars.md +++ b/extensions/_includes/idm_configvars.md @@ -22,4 +22,5 @@ | IDM_ADMIN_PASSWORD | string | | Password to set for the ocis "admin" user. Either cleartext or an argon2id hash| | IDM_SVC_PASSWORD | string | | Password to set for the "idm" service user. Either cleartext or an argon2id hash| | IDM_REVASVC_PASSWORD | string | | Password to set for the "reva" service user. Either cleartext or an argon2id hash| -| IDM_IDPSVC_PASSWORD | string | | Password to set for the "idp" service user. Either cleartext or an argon2id hash| \ No newline at end of file +| IDM_IDPSVC_PASSWORD | string | | Password to set for the "idp" service user. Either cleartext or an argon2id hash| +| OCIS_ADMIN_USER_ID
IDM_ADMIN_USER_ID | string | | | \ No newline at end of file diff --git a/extensions/_includes/settings-config-example.yaml b/extensions/_includes/settings-config-example.yaml index 435e72fc0ff..01faec69851 100644 --- a/extensions/_includes/settings-config-example.yaml +++ b/extensions/_includes/settings-config-example.yaml @@ -47,6 +47,7 @@ metadata_config: system_user_id: "" system_user_idp: internal system_user_api_key: "" +admin_user_id: "" asset: path: "" token_manager: diff --git a/extensions/_includes/settings_configvars.md b/extensions/_includes/settings_configvars.md index b33f1fb8be6..fbfa4f86556 100644 --- a/extensions/_includes/settings_configvars.md +++ b/extensions/_includes/settings_configvars.md @@ -25,5 +25,6 @@ | OCIS_SYSTEM_USER_ID
SETTINGS_SYSTEM_USER_ID | string | | | | OCIS_SYSTEM_USER_IDP
SETTINGS_SYSTEM_USER_IDP | string | internal | | | OCIS_SYSTEM_USER_API_KEY | string | | | +| OCIS_ADMIN_USER_ID
SETTINGS_ADMIN_USER_ID | string | | | | SETTINGS_ASSET_PATH | string | | | | OCIS_JWT_SECRET
SETTINGS_JWT_SECRET | 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 0f81fa363cf..8745cd85c8b 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-05-16T07:52:00Z +date: 2022-05-16T08:04:10Z 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 3b078232191..27c30e592af 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-05-16T07:52:00Z +date: 2022-05-16T08:04:10Z 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 90550190c11..ee06621d44b 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-05-16T07:52:00Z +date: 2022-05-16T08:04:10Z 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 af43367f1af..f55e55aea2e 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-05-16T07:52:00Z +date: 2022-05-16T08:04:10Z 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 0c25b57d136..d4f8c1d1331 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-05-16T07:52:00Z +date: 2022-05-16T08:04:10Z 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 fac6ffb6f7b..3747d3767b7 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-05-16T07:52:00Z +date: 2022-05-16T08:04:10Z 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 61a3cc4c0c5..549641d2b9d 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-05-16T07:52:00Z +date: 2022-05-16T08:04:10Z 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 da9f782fd09..f6dcea749e6 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-05-16T07:52:00Z +date: 2022-05-16T08:04:10Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis ---