reordering to align with reva, add missing owncloud options

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
owncloud · Sep 8, 2020 · bb278dd · bb278dd
1 parent 1cd35ce
commit bb278dd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/pkg/command/drivers.go b/pkg/command/drivers.go
@@ -77,10 +77,12 @@ func drivers(cfg *config.Config) map[string]interface{} {
 		},
 		"owncloud": map[string]interface{}{
 			"datadirectory":   cfg.Reva.Storages.OwnCloud.Root,
-			"scan":            cfg.Reva.Storages.OwnCloud.Scan,
+			"upload_info_dir": cfg.Reva.Storages.OwnCloud.UploadInfoDir,
+			"sharedirectory":  cfg.Reva.Storages.OwnCloud.ShareFolder,
+			"user_layout":     cfg.Reva.Storages.OwnCloud.UserLayout,
 			"redis":           cfg.Reva.Storages.OwnCloud.Redis,
 			"enable_home":     cfg.Reva.Storages.OwnCloud.EnableHome,
-			"user_layout":     cfg.Reva.Storages.OwnCloud.UserLayout,
+			"scan":            cfg.Reva.Storages.OwnCloud.Scan,
 			"userprovidersvc": cfg.Reva.Users.URL,
 		},
 		"ocis": map[string]interface{}{

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -190,8 +190,9 @@ type DriverEOS struct {
 type DriverOwnCloud struct {
 	DriverCommon
 
-	Redis string
-	Scan  bool
+	UploadInfoDir string
+	Redis         string
+	Scan          bool
 }
 
 // DriverS3 defines the available S3 storage driver configuration.

diff --git a/pkg/flagset/driverowncloud.go b/pkg/flagset/driverowncloud.go
@@ -15,6 +15,20 @@ func DriverOwnCloudWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"REVA_STORAGE_OWNCLOUD_DATADIR"},
 			Destination: &cfg.Reva.Storages.OwnCloud.Root,
 		},
+		&cli.StringFlag{
+			Name:        "storage-owncloud-uploadinfo-dir",
+			Value:       "/var/tmp/reva/uploadinfo",
+			Usage:       "the path to the tus upload info directory",
+			EnvVars:     []string{"REVA_STORAGE_OWNCLOUD_UPLOADINFO_DIR"},
+			Destination: &cfg.Reva.Storages.OwnCloud.UploadInfoDir,
+		},
+		&cli.StringFlag{
+			Name:        "storage-owncloud-uploadinfo-dir",
+			Value:       "/Shares",
+			Usage:       "name of the shares folder",
+			EnvVars:     []string{"REVA_STORAGE_OWNCLOUD_SHARE_FOLDER"},
+			Destination: &cfg.Reva.Storages.OwnCloud.ShareFolder,
+		},
 		&cli.BoolFlag{
 			Name:        "storage-owncloud-scan",
 			Value:       true,