commit 16c3b1a

Author: Benedikt Kulmann <[email protected]> Date: Wed May 4 10:27:07 2022 +0200 [full-ci] Bump web to v5.5.0-rc.2 (#3664) Bump web to v5.5.0-rc.2 Co-authored-by: Pascal Wengerter <[email protected]>
owncloud · May 4, 2022 · 131962f · 131962f
1 parent dd27509
commit 131962f
Show file tree

Hide file tree

Showing 18 changed files with 70 additions and 70 deletions.
diff --git a/extensions/_includes/proxy-config-example.yaml b/extensions/_includes/proxy-config-example.yaml
@@ -30,139 +30,139 @@ policies:
     endpoint: /
     backend: http://localhost:9100
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /.well-known/
     backend: http://localhost:9130
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /konnect/
     backend: http://localhost:9130
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /signin/
     backend: http://localhost:9130
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /archiver
     backend: http://localhost:9140
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: regex
     method: ""
     endpoint: /ocs/v[12].php/cloud/(users?|groups)
     backend: http://localhost:9110
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /ocs/
     backend: http://localhost:9140
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: query
     method: ""
     endpoint: /remote.php/?preview=1
     backend: http://localhost:9115
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: REPORT
     endpoint: /remote.php/dav/
     backend: http://localhost:9115
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /remote.php/
     backend: ""
     service: ocdav
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /dav/
     backend: ""
     service: ocdav
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /webdav/
     backend: ""
     service: ocdav
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /status.php
     backend: ""
     service: ocdav
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /index.php/
     backend: ""
     service: ocdav
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /apps/
     backend: ""
     service: ocdav
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /data
     backend: http://localhost:9140
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /app/
     backend: http://localhost:9140
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /graph/
     backend: http://localhost:9120
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /graph-explorer
     backend: http://localhost:9135
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /api/v0/accounts
     backend: http://localhost:9181
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /accounts.js
     backend: http://localhost:9181
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /api/v0/settings
     backend: http://localhost:9190
     service: ""
-    apache_vhost: false
+    apache-vhost: false
   - type: ""
     method: ""
     endpoint: /settings.js
     backend: http://localhost:9190
     service: ""
-    apache_vhost: false
+    apache-vhost: false
 oidc:
   issuer: https://localhost:9200
   insecure: true

diff --git a/...cludes/storage-system-config-example.yaml → ...udes/storage-metadata-config-example.yaml b/...cludes/storage-system-config-example.yaml → ...udes/storage-metadata-config-example.yaml
@@ -25,7 +25,7 @@ token_manager:
 reva:
   address: 127.0.0.1:9142
 machine_auth_api_key: ""
-system_user_id: ""
+metadata_user_id: ""
 skip_user_groups_in_token: false
 driver: ocis
 drivers:

diff --git a/extensions/_includes/storage-metadata_configvars.md b/extensions/_includes/storage-metadata_configvars.md
@@ -0,0 +1,29 @@
+## Environment Variables
+
+| Name | Type | Default Value | Description |
+|------|------|---------------|-------------|
+| OCIS_TRACING_ENABLED<br/>STORAGE_METADATA_TRACING_ENABLED | bool | false | Activates tracing.|
+| OCIS_TRACING_TYPE<br/>STORAGE_METADATA_TRACING_TYPE | string |  | |
+| OCIS_TRACING_ENDPOINT<br/>STORAGE_METADATA_TRACING_ENDPOINT | string |  | The endpoint to the tracing collector.|
+| OCIS_TRACING_COLLECTOR<br/>STORAGE_METADATA_TRACING_COLLECTOR | string |  | |
+| OCIS_LOG_LEVEL<br/>STORAGE_METADATA_LOG_LEVEL | string |  | The log level.|
+| OCIS_LOG_PRETTY<br/>STORAGE_METADATA_LOG_PRETTY | bool | false | Activates pretty log output.|
+| OCIS_LOG_COLOR<br/>STORAGE_METADATA_LOG_COLOR | bool | false | Activates colorized log output.|
+| OCIS_LOG_FILE<br/>STORAGE_METADATA_LOG_FILE | string |  | The target log file.|
+| STORAGE_METADATA_DEBUG_ADDR | string | 127.0.0.1:9217 | |
+| 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:9215 | 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.|
+| OCIS_JWT_SECRET<br/>STORAGE_METADATA_JWT_SECRET | string |  | |
+| REVA_GATEWAY | string | 127.0.0.1:9142 | |
+| STORAGE_METADATA_MACHINE_AUTH_API_KEY | string |  | |
+| STORAGE_METADATA_SKIP_USER_GROUPS_IN_TOKEN | bool | false | |
+| STORAGE_METADATA_DRIVER | string | ocis | The driver which should be used by the service|
+| STORAGE_METADATA_OCIS_ROOT | string | ~/.ocis/storage/metadata | |
+| STORAGE_METADATA_DATA_SERVER_URL | string | http://localhost:9216/data | |
+| STORAGE_METADATA_TEMP_FOLDER | string | ~/.ocis/tmp/metadata | |
+| OCIS_INSECURE<br/>STORAGE_METADATA_DATAPROVIDER_INSECURE | bool | false | |
diff --git a/extensions/_includes/storage-system_configvars.md b/extensions/_includes/storage-system_configvars.md
diff --git a/extensions/storage-metadata/_index.md b/extensions/storage-metadata/_index.md
@@ -3,7 +3,7 @@ title: Metadata Storage
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/storage-system
+geekdocEditPath: edit/master/docs/extensions/storage-metadata
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

diff --git a/extensions/storage-metadata/configuration.md b/extensions/storage-metadata/configuration.md
@@ -3,13 +3,13 @@ title: Service Configuration
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/storage-system
+geekdocEditPath: edit/master/docs/extensions/storage-metadata
 geekdocFilePath: configuration.md
 geekdocCollapseSection: true
 ---
 
 ## Example YAML Config
 
-{{< include file="extensions/_includes/storage-system-config-example.yaml"  language="yaml" >}}
+{{< include file="extensions/_includes/storage-metadata-config-example.yaml"  language="yaml" >}}
 
-{{< include file="extensions/_includes/storage-system_configvars.md" >}}
+{{< include file="extensions/_includes/storage-metadata_configvars.md" >}}
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-04T10:44:09Z
+date: 2022-05-04T11:02:34Z
 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-04T10:44:09Z
+date: 2022-05-04T11:02:34Z
 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-04T10:44:09Z
+date: 2022-05-04T11:02:34Z
 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-04T10:44:09Z
+date: 2022-05-04T11:02:34Z
 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-04T10:44:09Z
+date: 2022-05-04T11:02:34Z
 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-04T10:44:09Z
+date: 2022-05-04T11:02:34Z
 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-04T10:44:09Z
+date: 2022-05-04T11:02:34Z
 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-04T10:44:09Z
+date: 2022-05-04T11:02:34Z
 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-04T10:44:09Z
+date: 2022-05-04T11:02:34Z
 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-04T10:44:09Z
+date: 2022-05-04T11:02:34Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/ocis/release_notes.md b/ocis/release_notes.md
@@ -460,7 +460,7 @@ Our recommended update strategy to oCIS 1.6.0 is:
 1. let users recreate their shares
 
 If you want to use oCIS 1.6.0 without following our recommended update strategy, you can also keep the pre 1.6.0 behaviour by setting this environment variable:
-`export STORAGE_SYSTEM_ROOT=/var/tmp/ocis/storage/users`
+`export STORAGE_METADATA_ROOT=/var/tmp/ocis/storage/users`
 This may lead to faulty behaviour since both the metadata and user storage driver will be storing their data in the same filesystem path.
 
 ## ownCloud Infinite Scale 1.5.0 Technology Preview

diff --git a/ocis/storage-backends/eos.md b/ocis/storage-backends/eos.md
@@ -88,8 +88,8 @@ The uid and gid `2` are referencing the user `daemon` inside the ocis container.
 Kill the metadata storage. By default it uses the `ocis` storage driver. We need to switch it to the `eos` driver:
 
 ```
-docker-compose exec ocis ./bin/ocis kill storage-system
-docker-compose exec -e STORAGE_SYSTEM_DRIVER=eos -e STORAGE_SYSTEM_ROOT=/eos/dockertest/ocis/metadata ocis ./bin/ocis run storage-system
+docker-compose exec ocis ./bin/ocis kill storage-metadata
+docker-compose exec -e STORAGE_METADATA_DRIVER=eos -e STORAGE_METADATA_ROOT=/eos/dockertest/ocis/metadata ocis ./bin/ocis run storage-metadata
 ```