From ad466e46f2ea7630790312e0fd67cf70ce8d7d0f Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Wed, 16 Mar 2022 20:39:14 +0000 Subject: [PATCH] commit cc825d5658f1347b9bf80642ffbb7ad2263b34c8 Merge: 439c2030 7a0e28a4 Author: Michael Barz Date: Wed Mar 16 21:36:39 2022 +0100 Merge pull request #3283 from owncloud/drive-alias [full-ci] add driveAlias to the graphAPI --- .../_includes/storage-config-example.yaml | 26 +++++++++++++++++++ grpc_apis/ocis/messages/accounts/v0/grpc.md | 2 +- grpc_apis/ocis/messages/settings/v0/grpc.md | 2 +- grpc_apis/ocis/messages/store/v0/grpc.md | 2 +- grpc_apis/ocis/messages/thumbnails/v0/grpc.md | 2 +- grpc_apis/ocis/services/accounts/v0/grpc.md | 2 +- grpc_apis/ocis/services/settings/v0/grpc.md | 2 +- grpc_apis/ocis/services/store/v0/grpc.md | 2 +- grpc_apis/ocis/services/thumbnails/v0/grpc.md | 2 +- 9 files changed, 34 insertions(+), 8 deletions(-) diff --git a/extensions/_includes/storage-config-example.yaml b/extensions/_includes/storage-config-example.yaml index 94745097357..13ec5c673d9 100644 --- a/extensions/_includes/storage-config-example.yaml +++ b/extensions/_includes/storage-config-example.yaml @@ -84,6 +84,8 @@ reva: sharefolder: /Shares userlayout: '{{substr 0 1 .Username}}/{{.Username}}' enablehome: false + personalspacealiastemplate: "" + generalspacealiastemplate: "" shadownamespace: "" uploadsnamespace: "" eosbinary: /usr/bin/eos @@ -105,12 +107,16 @@ reva: sharefolder: /Shares userlayout: '{{.Username}}' enablehome: false + personalspacealiastemplate: "" + generalspacealiastemplate: "" owncloudsql: drivercommon: root: ~/.ocis/storage/owncloud sharefolder: /Shares userlayout: '{{.Username}}' enablehome: false + personalspacealiastemplate: "" + generalspacealiastemplate: "" uploadinfodir: ~/.ocis/storage/uploadinfo dbusername: owncloud dbpassword: owncloud @@ -123,6 +129,8 @@ reva: sharefolder: "" userlayout: "" enablehome: false + personalspacealiastemplate: "" + generalspacealiastemplate: "" region: default accesskey: "" secretkey: "" @@ -134,6 +142,9 @@ reva: sharefolder: /Shares userlayout: '{{.Id.OpaqueId}}' enablehome: false + personalspacealiastemplate: '{{.SpaceType}}/{{.User.Username | lower}}' + generalspacealiastemplate: '{{.SpaceType}}/{{.SpaceName | replace " " "-" + | lower}}' region: default accesskey: "" secretkey: "" @@ -145,6 +156,9 @@ reva: sharefolder: /Shares userlayout: '{{.Id.OpaqueId}}' enablehome: false + personalspacealiastemplate: '{{.SpaceType}}/{{.User.Username | lower}}' + generalspacealiastemplate: '{{.SpaceType}}/{{.SpaceName | replace " " "-" + | lower}}' metadatastorage: eos: drivercommon: @@ -152,6 +166,8 @@ reva: sharefolder: /Shares userlayout: '{{substr 0 1 .Username}}/{{.Username}}' enablehome: false + personalspacealiastemplate: "" + generalspacealiastemplate: "" shadownamespace: "" uploadsnamespace: "" eosbinary: /usr/bin/eos @@ -173,12 +189,16 @@ reva: sharefolder: "" userlayout: "" enablehome: false + personalspacealiastemplate: "" + generalspacealiastemplate: "" owncloudsql: drivercommon: root: "" sharefolder: "" userlayout: "" enablehome: false + personalspacealiastemplate: "" + generalspacealiastemplate: "" uploadinfodir: "" dbusername: "" dbpassword: "" @@ -191,6 +211,8 @@ reva: sharefolder: "" userlayout: "" enablehome: false + personalspacealiastemplate: "" + generalspacealiastemplate: "" region: default accesskey: "" secretkey: "" @@ -202,6 +224,8 @@ reva: sharefolder: "" userlayout: '{{.Id.OpaqueId}}' enablehome: false + personalspacealiastemplate: "" + generalspacealiastemplate: "" region: default accesskey: "" secretkey: "" @@ -213,6 +237,8 @@ reva: sharefolder: "" userlayout: '{{.Id.OpaqueId}}' enablehome: false + personalspacealiastemplate: "" + generalspacealiastemplate: "" frontend: port: maxcpus: "" diff --git a/grpc_apis/ocis/messages/accounts/v0/grpc.md b/grpc_apis/ocis/messages/accounts/v0/grpc.md index be26bc885c0..ee55a6f174d 100644 --- 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-03-16T17:22:53Z +date: 2022-03-16T20:38:15Z 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 index 2d2640d3824..5d181595971 100644 --- 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-03-16T17:22:53Z +date: 2022-03-16T20:38:15Z 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 index 6a5724534fb..d402227e072 100644 --- 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-03-16T17:22:53Z +date: 2022-03-16T20:38:15Z 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 index 57f15526177..a2acffff5b9 100644 --- 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-03-16T17:22:53Z +date: 2022-03-16T20:38:15Z 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 index 3e60f4b25d3..94bce924889 100644 --- 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-03-16T17:22:53Z +date: 2022-03-16T20:38:15Z 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 index 65ac756cfd3..d9ddc2b0e18 100644 --- 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-03-16T17:22:53Z +date: 2022-03-16T20:38:15Z 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 index a28931545e7..d8ce66242d2 100644 --- 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-03-16T17:22:53Z +date: 2022-03-16T20:38:15Z 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 index 8add89b05be..c577b520665 100644 --- 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-03-16T17:22:53Z +date: 2022-03-16T20:38:15Z weight: 50 geekdocRepo: https://github.com/owncloud/ocis ---