From e3c081ba1a8b67f9642b81c8caa3810c2ce23b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 8 Sep 2020 14:12:53 +0200 Subject: [PATCH] make home data use same enable home override config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- pkg/command/storagehomedata.go | 8 ++++++++ pkg/flagset/storagehomedata.go | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/pkg/command/storagehomedata.go b/pkg/command/storagehomedata.go index 6f909bd2d..3128fe034 100644 --- a/pkg/command/storagehomedata.go +++ b/pkg/command/storagehomedata.go @@ -70,6 +70,14 @@ func StorageHomeData(cfg *config.Config) *cli.Command { uuid := uuid.Must(uuid.NewV4()) pidFile := path.Join(os.TempDir(), "revad-"+c.Command.Name+"-"+uuid.String()+".pid") + // override driver enable home option with home config + if cfg.Reva.Storages.Home.EnableHome { + cfg.Reva.Storages.Common.EnableHome = true + cfg.Reva.Storages.EOS.EnableHome = true + cfg.Reva.Storages.Local.EnableHome = true + cfg.Reva.Storages.OwnCloud.EnableHome = true + cfg.Reva.Storages.S3.EnableHome = true + } rcfg := map[string]interface{}{ "core": map[string]interface{}{ "max_cpus": cfg.Reva.Users.MaxCPUs, diff --git a/pkg/flagset/storagehomedata.go b/pkg/flagset/storagehomedata.go index 1d00b4ae5..4dc9ccf04 100644 --- a/pkg/flagset/storagehomedata.go +++ b/pkg/flagset/storagehomedata.go @@ -77,6 +77,13 @@ func StorageHomeDataWithConfig(cfg *config.Config) []cli.Flag { EnvVars: []string{"REVA_STORAGE_HOME_DATA_TEMP_FOLDER"}, Destination: &cfg.Reva.StorageHomeData.TempFolder, }, + &cli.BoolFlag{ + Name: "enable-home", + Value: true, + Usage: "enable the creation of home directories", + EnvVars: []string{"REVA_STORAGE_HOME_ENABLE_HOME"}, + Destination: &cfg.Reva.Storages.Home.EnableHome, + }, // Gateway