configure users and metadata storage separately

2021-10-11 11:39:36 +02:00
parent 5f0cf077ca
commit d74816f242
34 changed files with 1196 additions and 605 deletions
@@ -201,14 +201,12 @@ type PublicStorage struct {

 // StorageConfig combines all available storage driver configuration parts.
 type StorageConfig struct {
-	Home        DriverCommon
 	EOS         DriverEOS
 	Local       DriverCommon
 	OwnCloud    DriverOwnCloud
 	OwnCloudSQL DriverOwnCloudSQL
 	S3          DriverS3
 	S3NG        DriverS3NG
-	Common      DriverCommon
 	OCIS        DriverOCIS
 	// TODO checksums ... figure out what that is supposed to do
 }
@@ -289,6 +287,8 @@ type DriverEOS struct {

 // DriverOCIS defines the available oCIS storage driver configuration.
 type DriverOCIS struct {
+	DriverCommon
+
 	ServiceUserUUID string
 }

@@ -438,7 +438,8 @@ type Reva struct {
 	UserOwnCloudSQL UserOwnCloudSQL
 	OCDav           OCDav
 	Archiver        Archiver
-	Storages        StorageConfig
+	UserStorage     StorageConfig
+	MetadataStorage StorageConfig
 	// Ports are used to configure which services to start on which port
 	Frontend          FrontendPort
 	DataGateway       DataGatewayPort