diff --git a/storage/pkg/command/drivers.go b/storage/pkg/command/drivers.go index e97bf7eda..bd1e95035 100644 --- a/storage/pkg/command/drivers.go +++ b/storage/pkg/command/drivers.go @@ -90,9 +90,7 @@ func drivers(cfg *config.Config) map[string]interface{} { "upload_info_dir": cfg.Reva.Storages.OwnCloudSql.UploadInfoDir, "sharedirectory": cfg.Reva.Storages.OwnCloudSql.ShareFolder, "user_layout": cfg.Reva.Storages.OwnCloudSql.UserLayout, - "redis": cfg.Reva.Storages.OwnCloudSql.Redis, "enable_home": cfg.Reva.Storages.OwnCloudSql.EnableHome, - "scan": cfg.Reva.Storages.OwnCloudSql.Scan, "dbusername": cfg.Reva.Storages.OwnCloudSql.DBUsername, "dbpassword": cfg.Reva.Storages.OwnCloudSql.DBPassword, "dbhost": cfg.Reva.Storages.OwnCloudSql.DBHost, diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go index 2878e815d..7895e0a1b 100644 --- a/storage/pkg/config/config.go +++ b/storage/pkg/config/config.go @@ -264,8 +264,6 @@ type DriverOwnCloudSql struct { DriverCommon UploadInfoDir string - Redis string - Scan bool DBUsername string DBPassword string DBHost string diff --git a/storage/pkg/flagset/driverowncloudsql.go b/storage/pkg/flagset/driverowncloudsql.go index 9cf233793..4a046aae1 100644 --- a/storage/pkg/flagset/driverowncloudsql.go +++ b/storage/pkg/flagset/driverowncloudsql.go @@ -30,20 +30,6 @@ func DriverOwnCloudSqlWithConfig(cfg *config.Config) []cli.Flag { EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_SHARE_FOLDER"}, Destination: &cfg.Reva.Storages.OwnCloudSql.ShareFolder, }, - &cli.BoolFlag{ - Name: "storage-owncloudsql-scan", - Value: flags.OverrideDefaultBool(cfg.Reva.Storages.OwnCloudSql.Scan, true), - Usage: "scan files on startup to add fileids", - EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_SCAN"}, - Destination: &cfg.Reva.Storages.OwnCloudSql.Scan, - }, - &cli.StringFlag{ - Name: "storage-owncloudsql-redis", - Value: flags.OverrideDefaultString(cfg.Reva.Storages.OwnCloudSql.Redis, ":6379"), - Usage: "the address of the redis server", - EnvVars: []string{"STORAGE_DRIVER_OWNCLOUDSQL_REDIS_ADDR"}, - Destination: &cfg.Reva.Storages.OwnCloudSql.Redis, - }, &cli.BoolFlag{ Name: "storage-owncloudsql-enable-home", Value: flags.OverrideDefaultBool(cfg.Reva.Storages.OwnCloudSql.EnableHome, false),