commit 09b89f7

Merge: 2e913fa 379a7fd Author: Jörn Friedrich Dreyer <[email protected]> Date: Mon Jun 20 07:55:12 2022 +0000 Merge pull request #3697 from owncloud/change-default-sharing-driver-to-cs3 [full-ci] change default sharing driver to cs3
owncloud · Jun 20, 2022 · b7c58a8 · b7c58a8
1 parent 916a11c
commit b7c58a8
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/extensions/_includes/adoc/sharing_configvars.adoc b/extensions/_includes/adoc/sharing_configvars.adoc
@@ -152,7 +152,7 @@ a| [subs=-attributes]
 |`SHARING_USER_DRIVER`
 | string
 a| [subs=-attributes]
-json 
+cs3 
 a| [subs=-attributes]
 
 
@@ -239,7 +239,7 @@ a| [subs=-attributes]
 |`SHARING_PUBLIC_DRIVER`
 | string
 a| [subs=-attributes]
-json 
+cs3 
 a| [subs=-attributes]
 
 

diff --git a/extensions/_includes/sharing-config-example.yaml b/extensions/_includes/sharing-config-example.yaml
@@ -27,7 +27,7 @@ events:
   endpoint: 127.0.0.1:9233
   cluster: ocis-cluster
 skip_user_groups_in_token: false
-user_sharing_driver: json
+user_sharing_driver: cs3
 user_sharing_drivers:
   json:
     file: ~/.ocis/storage/shares.json
@@ -43,7 +43,7 @@ user_sharing_drivers:
     db_port: 3306
     db_name: owncloud
     user_storage_mount_id: ""
-public_sharing_driver: json
+public_sharing_driver: cs3
 public_sharing_drivers:
   json:
     file: ~/.ocis/storage/publicshares.json

diff --git a/extensions/_includes/sharing_configvars.md b/extensions/_includes/sharing_configvars.md
@@ -21,7 +21,7 @@
 | SHARING_EVENTS_ENDPOINT | string | 127.0.0.1:9233 | the address of the streaming service|
 | SHARING_EVENTS_CLUSTER | string | ocis-cluster | the clusterID of the streaming service. Mandatory when using nats|
 | SHARING_SKIP_USER_GROUPS_IN_TOKEN | bool | false | |
-| SHARING_USER_DRIVER | string | json | |
+| SHARING_USER_DRIVER | string | cs3 | |
 | SHARING_USER_JSON_FILE | string | ~/.ocis/storage/shares.json | |
 | SHARING_USER_CS3_PROVIDER_ADDR | string | 127.0.0.1:9215 | |
 | OCIS_SYSTEM_USER_ID<br/>SHARING_USER_CS3_SYSTEM_USER_ID | string |  | |
@@ -33,7 +33,7 @@
 | SHARING_USER_OWNCLOUDSQL_DB_PORT | int | 3306 | |
 | SHARING_USER_OWNCLOUDSQL_DB_NAME | string | owncloud | |
 | SHARING_USER_OWNCLOUDSQL_USER_STORAGE_MOUNT_ID | string |  | |
-| SHARING_PUBLIC_DRIVER | string | json | |
+| SHARING_PUBLIC_DRIVER | string | cs3 | |
 | SHARING_PUBLIC_JSON_FILE | string | ~/.ocis/storage/publicshares.json | |
 | SHARING_PUBLIC_CS3_PROVIDER_ADDR | string | 127.0.0.1:9215 | |
 | OCIS_SYSTEM_USER_ID<br/>SHARING_PUBLIC_CS3_SYSTEM_USER_ID | 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-06-20T04:17:30Z
+date: 2022-06-20T07:56:46Z
 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-06-20T04:17:30Z
+date: 2022-06-20T07:56:46Z
 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-06-20T04:17:30Z
+date: 2022-06-20T07:56:46Z
 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-06-20T04:17:30Z
+date: 2022-06-20T07:56:46Z
 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-06-20T04:17:30Z
+date: 2022-06-20T07:56:46Z
 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-06-20T04:17:30Z
+date: 2022-06-20T07:56:46Z
 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-06-20T04:17:30Z
+date: 2022-06-20T07:56:46Z
 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-06-20T04:17:30Z
+date: 2022-06-20T07:56:46Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---