commit 922d141

Merge: 008622e 97220e6 Author: Willy Kloucek <[email protected]> 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
owncloud · May 16, 2022 · 8ff1829 · 8ff1829
1 parent f79efd4
commit 8ff1829
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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|
+| IDM_IDPSVC_PASSWORD | string |  | Password to set for the "idp" service user. Either cleartext or an argon2id hash|
+| OCIS_ADMIN_USER_ID<br/>IDM_ADMIN_USER_ID | string |  | |
diff --git 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
@@ -25,5 +25,6 @@
 | OCIS_SYSTEM_USER_ID<br/>SETTINGS_SYSTEM_USER_ID | string |  | |
 | OCIS_SYSTEM_USER_IDP<br/>SETTINGS_SYSTEM_USER_IDP | string | internal | |
 | OCIS_SYSTEM_USER_API_KEY | string |  | |
+| OCIS_ADMIN_USER_ID<br/>SETTINGS_ADMIN_USER_ID | string |  | |
 | SETTINGS_ASSET_PATH | string |  | |
 | OCIS_JWT_SECRET<br/>SETTINGS_JWT_SECRET | string |  | |
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 ---