commit 398caee

Merge: 0bb8300 3074d70 Author: Jörn Friedrich Dreyer <jfd@owncloud.com> Date: Mon May 2 15:16:27 2022 +0200 Merge pull request #3602 from owncloud/metadata-gateway introduce metadata gateway
owncloud · May 2, 2022 · 95edcca · 95edcca
1 parent 8ce1139
commit 95edcca
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 39 deletions.
diff --git a/extensions/_includes/settings-config-example.yaml b/extensions/_includes/settings-config-example.yaml
@@ -40,10 +40,10 @@ grpc:
 store_type: metadata
 data_path: ~/.ocis/settings
 metadata_config:
-  gateway_addr: 127.0.0.1:9142
+  gateway_addr: 127.0.0.1:9215
   storage_addr: 127.0.0.1:9215
-  service_user_id: 95cb8724-03b2-11eb-a0a6-c33ef8ef53ad
-  service_user_idp: https://localhost:9200
+  service_user_id: ""
+  service_user_idp: internal
   machine_auth_api_key: ""
 asset:
   path: ""

diff --git a/extensions/_includes/settings_configvars.md b/extensions/_includes/settings_configvars.md
@@ -12,9 +12,9 @@
 | SETTINGS_GRPC_ADDR | string | 127.0.0.1:9191 | |
 | SETTINGS_STORE_TYPE | string | metadata | |
 | SETTINGS_DATA_PATH | string | ~/.ocis/settings | |
-| STORAGE_GATEWAY_GRPC_ADDR | string | 127.0.0.1:9142 | |
+| STORAGE_GATEWAY_GRPC_ADDR | string | 127.0.0.1:9215 | |
 | STORAGE_GRPC_ADDR | string | 127.0.0.1:9215 | |
-| METADATA_SERVICE_USER_UUID | string | 95cb8724-03b2-11eb-a0a6-c33ef8ef53ad | |
-| OCIS_URL;METADATA_SERVICE_USER_IDP | string | https://localhost:9200 | |
+| METADATA_SERVICE_USER_UUID | string |  | |
+| METADATA_SERVICE_USER_IDP | string | internal | |
 | OCIS_MACHINE_AUTH_API_KEY | string |  | |
 | SETTINGS_ASSET_PATH | string |  | |
diff --git a/extensions/_includes/sharing-config-example.yaml b/extensions/_includes/sharing-config-example.yaml
@@ -38,8 +38,8 @@ user_sharin_drivers:
     userstoragemountid: ""
   cs3:
     provideraddr: 127.0.0.1:9215
-    serviceuserid: 95cb8724-03b2-11eb-a0a6-c33ef8ef53ad
-    serviceuseridp: https://localhost:9200
+    serviceuserid: ""
+    serviceuseridp: internal
     machineauthapikey: ""
 public_sharing_driver: json
 public_sharing_drivers:
@@ -57,8 +57,8 @@ public_sharing_drivers:
     userstoragemountid: ""
   cs3:
     provideraddr: 127.0.0.1:9215
-    serviceuserid: 95cb8724-03b2-11eb-a0a6-c33ef8ef53ad
-    serviceuseridp: https://localhost:9200
+    serviceuserid: ""
+    serviceuseridp: internal
     machineauthapikey: ""
 events:
   addr: 127.0.0.1:9233

diff --git a/extensions/_includes/sharing_configvars.md b/extensions/_includes/sharing_configvars.md
@@ -14,6 +14,6 @@
 | SHARING_USER_SQL_HOST | string |  | |
 | SHARING_USER_SQL_PORT | int | 1433 | |
 | SHARING_USER_SQL_NAME | string |  | |
-| OCIS_URL;SHARING_CS3_SERVICE_USER_IDP | string | https://localhost:9200 | |
+| OCIS_URL;SHARING_CS3_SERVICE_USER_IDP | string | internal | |
 | OCIS_MACHINE_AUTH_API_KEY | string |  | |
 | OCIS_MACHINE_AUTH_API_KEY | string |  | |
diff --git a/extensions/_includes/storage-config-example.yaml b/extensions/_includes/storage-config-example.yaml
@@ -456,7 +456,7 @@ reva:
     user_json_file: ~/.ocis/storage/shares.json
     provider_addr: 127.0.0.1:9215
     service_user_id: 95cb8724-03b2-11eb-a0a6-c33ef8ef53ad
-    service_user_idp: https://localhost:9200
+    service_user_idp: internal
     user_sql_username: ""
     user_sql_password: ""
     user_sql_host: ""

diff --git a/extensions/_includes/storage-metadata-config-example.yaml b/extensions/_includes/storage-metadata-config-example.yaml
@@ -25,6 +25,8 @@ token_manager:
   jwt_secret: ""
 reva:
   address: 127.0.0.1:9142
+machine_auth_api_key: ""
+metadata_user_id: ""
 skip_user_groups_in_token: false
 driver: ocis
 drivers:
@@ -44,15 +46,15 @@ drivers:
     shadow_hidden_files: false
     force_single_user_mode: false
     user_keytab: false
-    gateway_svc: 127.0.0.1:9142
+    gateway_svc: 127.0.0.1:9215
     grpcuri: ""
     userlayout: '{{substr 0 1 .Username}}/{{.Username}}'
   local:
     root: ~/.ocis/storage/local/metadata
   ocis:
     root: ~/.ocis/storage/metadata
     userlayout: '{{.Id.OpaqueId}}'
-    permissionsendpoint: 127.0.0.1:9191
+    permissionsendpoint: 127.0.0.1:9215
   s3:
     region: default
     access_key: ""
@@ -62,7 +64,7 @@ drivers:
   s3ng:
     root: ~/.ocis/storage/metadata
     userlayout: '{{.Id.OpaqueId}}'
-    permissionsendpoint: 127.0.0.1:9191
+    permissionsendpoint: 127.0.0.1:9215
     region: default
     access_key: ""
     secret_key: ""

diff --git a/extensions/_includes/storage-metadata_configvars.md b/extensions/_includes/storage-metadata_configvars.md
@@ -8,8 +8,9 @@
 | STORAGE_METADATA_DEBUG_ZPAGES | bool | false | |
 | STORAGE_METADATA_GRPC_ADDR | string | 127.0.0.1:9215 | The address of the grpc service.|
 | STORAGE_METADATA_GRPC_PROTOCOL | string | tcp | The transport protocol of the grpc service.|
-| STORAGE_METADATA_GRPC_ADDR | string | 127.0.0.1:9216 | The address of the grpc service.|
-| STORAGE_METADATA_GRPC_PROTOCOL | string | tcp | The transport protocol of the grpc service.|
+| STORAGE_METADATA_HTTP_ADDR | string | 127.0.0.1:9216 | The address of the http service.|
+| STORAGE_METADATA_HTTP_PROTOCOL | string | tcp | The transport protocol of the http service.|
+| STORAGE_METADATA_MACHINE_AUTH_API_KEY | string |  | |
 | STORAGE_METADATA_DRIVER | string | ocis | The driver which should be used by the service|
 | STORAGE_METADATA_DRIVER_OCIS_ROOT | string | ~/.ocis/storage/metadata | |
 | OCIS_INSECURE;STORAGE_METADATA_DATAPROVIDER_INSECURE | bool | false | |
diff --git a/extensions/_includes/storage-publiclink_configvars.md b/extensions/_includes/storage-publiclink_configvars.md
@@ -2,9 +2,9 @@
 
 | Name | Type | Default Value | Description |
 |------|------|---------------|-------------|
-| STORAGE_METADATA_DEBUG_ADDR | string | 127.0.0.1:9179 | |
-| STORAGE_METADATA_DEBUG_TOKEN | string |  | |
-| STORAGE_METADATA_DEBUG_PPROF | bool | false | |
-| STORAGE_METADATA_DEBUG_ZPAGES | bool | false | |
-| STORAGE_METADATA_GRPC_ADDR | string | 127.0.0.1:9178 | The address of the grpc service.|
-| STORAGE_METADATA_GRPC_PROTOCOL | string | tcp | The transport protocol of the grpc service.|
+| STORAGE_PUBLICLINK_DEBUG_ADDR | string | 127.0.0.1:9179 | |
+| STORAGE_PUBLICLINK_DEBUG_TOKEN | string |  | |
+| STORAGE_PUBLICLINK_DEBUG_PPROF | bool | false | |
+| STORAGE_PUBLICLINK_DEBUG_ZPAGES | bool | false | |
+| STORAGE_PUBLICLINK_GRPC_ADDR | string | 127.0.0.1:9178 | The address of the grpc service.|
+| STORAGE_PUBLICLINK_GRPC_PROTOCOL | string | tcp | The transport protocol of the grpc service.|
diff --git a/extensions/_includes/storage-shares_configvars.md b/extensions/_includes/storage-shares_configvars.md
@@ -2,11 +2,11 @@
 
 | Name | Type | Default Value | Description |
 |------|------|---------------|-------------|
-| STORAGE_METADATA_DEBUG_ADDR | string | 127.0.0.1:9156 | |
-| STORAGE_METADATA_DEBUG_TOKEN | string |  | |
-| STORAGE_METADATA_DEBUG_PPROF | bool | false | |
-| STORAGE_METADATA_DEBUG_ZPAGES | bool | false | |
-| STORAGE_METADATA_GRPC_ADDR | string | 127.0.0.1:9154 | The address of the grpc service.|
-| STORAGE_METADATA_GRPC_PROTOCOL | string | tcp | The transport protocol of the grpc service.|
-| STORAGE_METADATA_GRPC_ADDR | string | 127.0.0.1:9155 | The address of the grpc service.|
-| STORAGE_METADATA_GRPC_PROTOCOL | string | tcp | The transport protocol of the grpc service.|
+| STORAGE_SHARES_DEBUG_ADDR | string | 127.0.0.1:9156 | |
+| STORAGE_SHARES_DEBUG_TOKEN | string |  | |
+| STORAGE_SHARES_DEBUG_PPROF | bool | false | |
+| STORAGE_SHARES_DEBUG_ZPAGES | bool | false | |
+| STORAGE_SHARES_GRPC_ADDR | string | 127.0.0.1:9154 | The address of the grpc service.|
+| STORAGE_SHARES_GRPC_PROTOCOL | string | tcp | The transport protocol of the grpc service.|
+| STORAGE_SHARES_HTTP_ADDR | string | 127.0.0.1:9155 | The address of the grpc service.|
+| STORAGE_SHARES_HTTP_PROTOCOL | string | tcp | The transport protocol of the grpc service.|
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-02T12:37:17Z
+date: 2022-05-02T13:18:05Z
 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-02T12:37:17Z
+date: 2022-05-02T13:18:05Z
 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-02T12:37:18Z
+date: 2022-05-02T13:18:05Z
 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-02T12:37:18Z
+date: 2022-05-02T13:18:05Z
 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-02T12:37:17Z
+date: 2022-05-02T13:18:05Z
 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-02T12:37:18Z
+date: 2022-05-02T13:18:05Z
 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-02T12:37:18Z
+date: 2022-05-02T13:18:05Z
 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-02T12:37:17Z
+date: 2022-05-02T13:18:05Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---