commit cc825d5

Merge: 439c203 7a0e28a Author: Michael Barz <mbarz@owncloud.com> Date: Wed Mar 16 21:36:39 2022 +0100 Merge pull request #3283 from owncloud/drive-alias [full-ci] add driveAlias to the graphAPI
owncloud · Mar 16, 2022 · ad466e4 · ad466e4
1 parent f271432
commit ad466e4
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 8 deletions.
diff --git 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,13 +156,18 @@ reva:
  sharefolder: /Shares
  userlayout: '{{.Id.OpaqueId}}'
  enablehome: false
+ personalspacealiastemplate: '{{.SpaceType}}/{{.User.Username | lower}}'
+ generalspacealiastemplate: '{{.SpaceType}}/{{.SpaceName | replace " " "-"
+ | lower}}'
  metadatastorage:
  eos:
  drivercommon:
  root: /eos/dockertest/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 ---