commit 25dc46e

Author: kobergj <jkoberg@owncloud.com> Date: Wed May 4 16:31:18 2022 +0200 ServiceUser -> SystemUser (#3673) * serviceUser -> systemUser Signed-off-by: jkoberg <jkoberg@owncloud.com> * changelog Signed-off-by: jkoberg <jkoberg@owncloud.com> * leave out OCIS_URL, cleanup Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> Co-authored-by: Jörn Friedrich Dreyer <jfd@butonic.de>
owncloud · May 4, 2022 · 5e459cd · 5e459cd
1 parent 8f968cb
commit 5e459cd
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 30 deletions.
diff --git a/extensions/_includes/adoc/settings_configvars.adoc b/extensions/_includes/adoc/settings_configvars.adoc
@@ -94,11 +94,13 @@ SETTINGS_LOG_FILE`
 | string
 | 127.0.0.1:9215
 | 
-| `METADATA_SERVICE_USER_UUID`
+| `OCIS_SYSTEM_USER_ID +
+SETTINGS_SYSTEM_USER_ID`
 | string
 | 
 | 
-| `METADATA_SERVICE_USER_IDP`
+| `OCIS_SYSTEM_USER_IDP +
+SETTINGS_SYSTEM_USER_IDP`
 | string
 | internal
 | 

diff --git a/extensions/_includes/adoc/sharing_configvars.adoc b/extensions/_includes/adoc/sharing_configvars.adoc
@@ -103,12 +103,13 @@ SHARING_JWT_SECRET`
 | string
 | 127.0.0.1:9215
 | 
-| `SHARING_USER_CS3_SERVICE_USER_ID`
+| `OCIS_SYSTEM_USER_ID +
+SHARING_USER_CS3_SYSTEM_USER_ID`
 | string
 | 
 | 
-| `OCIS_URL +
-SHARING_USER_CS3_SERVICE_USER_IDP`
+| `OCIS_SYSTEM_USER_IDP +
+SHARING_USER_CS3_SYSTEM_USER_IDP`
 | string
 | internal
 | 
@@ -153,12 +154,13 @@ SHARING_USER_CS3_SYSTEM_USER_API_KEY`
 | string
 | 127.0.0.1:9215
 | 
-| `SHARING_PUBLIC_CS3_SERVICE_USER_ID`
+| `OCIS_SYSTEM_USER_ID +
+SHARING_PUBLIC_CS3_SYSTEM_USER_ID`
 | string
 | 
 | 
-| `OCIS_URL +
-SHARING_PUBLIC_CS3_SERVICE_USER_IDP`
+| `OCIS_SYSTEM_USER_IDP +
+SHARING_PUBLIC_CS3_SYSTEM_USER_IDP`
 | string
 | internal
 | 

diff --git a/extensions/_includes/settings-config-example.yaml b/extensions/_includes/settings-config-example.yaml
@@ -44,8 +44,8 @@ data_path: ~/.ocis/settings
 metadata_config:
   gateway_addr: 127.0.0.1:9215
   storage_addr: 127.0.0.1:9215
-  service_user_id: ""
-  service_user_idp: internal
+  system_user_id: ""
+  system_user_idp: internal
   system_user_api_key: ""
 asset:
   path: ""

diff --git a/extensions/_includes/settings_configvars.md b/extensions/_includes/settings_configvars.md
@@ -22,8 +22,8 @@
 | SETTINGS_DATA_PATH | string | ~/.ocis/settings | |
 | STORAGE_GATEWAY_GRPC_ADDR | string | 127.0.0.1:9215 | |
 | STORAGE_GRPC_ADDR | string | 127.0.0.1:9215 | |
-| METADATA_SERVICE_USER_UUID | string |  | |
-| METADATA_SERVICE_USER_IDP | string | internal | |
+| 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 |  | |
 | SETTINGS_ASSET_PATH | string |  | |
 | OCIS_JWT_SECRET<br/>SETTINGS_JWT_SECRET | string |  | |
diff --git a/extensions/_includes/sharing-config-example.yaml b/extensions/_includes/sharing-config-example.yaml
@@ -33,8 +33,8 @@ user_sharing_drivers:
     file: ~/.ocis/storage/shares.json
   cs3:
     provider_addr: 127.0.0.1:9215
-    service_user_id: ""
-    service_user_idp: internal
+    system_user_id: ""
+    system_user_idp: internal
     system_user_api_key: ""
   owncloudsql:
     db_username: ""
@@ -49,6 +49,6 @@ public_sharing_drivers:
     file: ~/.ocis/storage/publicshares.json
   cs3:
     provider_addr: 127.0.0.1:9215
-    service_user_id: ""
-    service_user_idp: internal
+    system_user_id: ""
+    system_user_idp: internal
     system_user_api_key: ""
diff --git a/extensions/_includes/sharing_configvars.md b/extensions/_includes/sharing_configvars.md
@@ -24,8 +24,8 @@
 | SHARING_USER_DRIVER | string | json | |
 | SHARING_USER_JSON_FILE | string | ~/.ocis/storage/shares.json | |
 | SHARING_USER_CS3_PROVIDER_ADDR | string | 127.0.0.1:9215 | |
-| SHARING_USER_CS3_SERVICE_USER_ID | string |  | |
-| OCIS_URL<br/>SHARING_USER_CS3_SERVICE_USER_IDP | string | internal | |
+| OCIS_SYSTEM_USER_ID<br/>SHARING_USER_CS3_SYSTEM_USER_ID | string |  | |
+| OCIS_SYSTEM_USER_IDP<br/>SHARING_USER_CS3_SYSTEM_USER_IDP | string | internal | |
 | OCIS_SYSTEM_USER_API_KEY<br/>SHARING_USER_CS3_SYSTEM_USER_API_KEY | string |  | |
 | SHARING_USER_OWNCLOUDSQL_DB_USERNAME | string |  | |
 | SHARING_USER_OWNCLOUDSQL_DB_PASSWORD | string |  | |
@@ -36,6 +36,6 @@
 | SHARING_PUBLIC_DRIVER | string | json | |
 | SHARING_PUBLIC_JSON_FILE | string | ~/.ocis/storage/publicshares.json | |
 | SHARING_PUBLIC_CS3_PROVIDER_ADDR | string | 127.0.0.1:9215 | |
-| SHARING_PUBLIC_CS3_SERVICE_USER_ID | string |  | |
-| OCIS_URL<br/>SHARING_PUBLIC_CS3_SERVICE_USER_IDP | string | internal | |
+| OCIS_SYSTEM_USER_ID<br/>SHARING_PUBLIC_CS3_SYSTEM_USER_ID | string |  | |
+| OCIS_SYSTEM_USER_IDP<br/>SHARING_PUBLIC_CS3_SYSTEM_USER_IDP | string | internal | |
 | OCIS_SYSTEM_USER_API_KEY<br/>SHARING_USER_CS3_SYSTEM_USER_API_KEY | string |  | |
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-05-04T13:50:03Z
+date: 2022-05-04T14:33:12Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

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-04T13:50:03Z
+date: 2022-05-04T14:33:12Z
 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-04T13:50:03Z
+date: 2022-05-04T14:33:12Z
 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-04T13:50:03Z
+date: 2022-05-04T14:33:12Z
 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-04T13:50:03Z
+date: 2022-05-04T14:33:12Z
 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-05-04T13:50:04Z
+date: 2022-05-04T14:33:12Z
 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-04T13:50:04Z
+date: 2022-05-04T14:33:12Z
 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-04T13:50:04Z
+date: 2022-05-04T14:33:12Z
 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-04T13:50:04Z
+date: 2022-05-04T14:33:12Z
 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-04T13:50:03Z
+date: 2022-05-04T14:33:12Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---