commit 4c7eed8

Merge: 385142f 2a09da2 Author: Michael Barz <[email protected]> Date: Mon Apr 11 16:36:01 2022 +0200 Merge pull request #3507 from rhafer/idmadmin Fix ocis admin creation for idm
owncloud · Apr 11, 2022 · 553c450 · 553c450
1 parent 1e15722
commit 553c450
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 12 deletions.
diff --git a/extensions/_includes/idm-config-example.yaml b/extensions/_includes/idm-config-example.yaml
@@ -21,6 +21,7 @@ idm:
   database: ~/.ocis/idm/ocis.boltdb
 create_demo_users: false
 service_user_passwords:
-  admin_password: idm
+  admin_password: admin
+  idm_password: idm
   reva_password: reva
   idp_password: idp
diff --git a/extensions/_includes/idm_configvars.md b/extensions/_includes/idm_configvars.md
@@ -11,6 +11,7 @@
 | IDM_LDAPS_KEY | string | ~/.ocis/idm/ldap.key | File name for the TLS certificate key for the server certificate|
 | IDM_DATABASE_PATH | string | ~/.ocis/idm/ocis.boltdb | Full path to the idm backend database|
 | IDM_CREATE_DEMO_USERS;ACCOUNTS_DEMO_USERS_AND_GROUPS | bool | false | Flag to enabe/disable the creation of the demo users|
-| IDM_ADMIN_PASSWORD | string | idm | Password to set for the "idm" service users. Either cleartext or an argon2id hash|
-| IDM_REVASVC_PASSWORD | string | reva | Password to set for the "reva" service users. Either cleartext or an argon2id hash|
-| IDM_IDPSVC_PASSWORD | string | idp | Password to set for the "idp" service users. Either cleartext or an argon2id hash|
+| IDM_ADMIN_PASSWORD | string | admin | Password to set for the ocis "admin" user. Either cleartext or an argon2id hash|
+| IDM_SVC_PASSWORD | string | idm | Password to set for the "idm" service user. Either cleartext or an argon2id hash|
+| IDM_REVASVC_PASSWORD | string | reva | Password to set for the "reva" service user. Either cleartext or an argon2id hash|
+| IDM_IDPSVC_PASSWORD | string | idp | Password to set for the "idp" service user. Either cleartext or an argon2id hash|
diff --git a/grpc_apis/ocis/messages/accounts/v0/grpc.md b/grpc_apis/ocis/messages/accounts/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.accounts.v0"
 url: /grpc_apis/ocis_messages_accounts_v0
-date: 2022-04-11T14:29:08Z
+date: 2022-04-11T14:37:02Z
 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-04-11T14:29:08Z
+date: 2022-04-11T14:37:02Z
 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-04-11T14:29:08Z
+date: 2022-04-11T14:37:02Z
 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-04-11T14:29:08Z
+date: 2022-04-11T14:37:02Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/accounts/v0/grpc.md b/grpc_apis/ocis/services/accounts/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.accounts.v0"
 url: /grpc_apis/ocis_services_accounts_v0
-date: 2022-04-11T14:29:08Z
+date: 2022-04-11T14:37:02Z
 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-04-11T14:29:08Z
+date: 2022-04-11T14:37:02Z
 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-04-11T14:29:08Z
+date: 2022-04-11T14:37:02Z
 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-04-11T14:29:08Z
+date: 2022-04-11T14:37:02Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---