From 9ef00931a5457dc5157ccbde12f4d670746e1669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 31 Mar 2020 08:45:18 +0200 Subject: [PATCH] fix eos config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/fix-eos-config.md | 5 +++++ pkg/command/storagehome.go | 2 ++ pkg/command/storagehomedata.go | 2 ++ pkg/command/storageoc.go | 2 ++ pkg/command/storageocdata.go | 2 ++ pkg/command/storageroot.go | 2 ++ 6 files changed, 15 insertions(+) create mode 100644 changelog/unreleased/fix-eos-config.md diff --git a/changelog/unreleased/fix-eos-config.md b/changelog/unreleased/fix-eos-config.md new file mode 100644 index 0000000..e0e9ed6 --- /dev/null +++ b/changelog/unreleased/fix-eos-config.md @@ -0,0 +1,5 @@ +Bugfix: Fix eos config + +We have added missing config options for the home layout to the config struct that is passed to eos. + +https://github.com/owncloud/ocis-reva/pull/125 diff --git a/pkg/command/storagehome.go b/pkg/command/storagehome.go index 5bcb098..628ffb9 100644 --- a/pkg/command/storagehome.go +++ b/pkg/command/storagehome.go @@ -99,6 +99,8 @@ func StorageHome(cfg *config.Config) *cli.Command { "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, "keytab": cfg.Reva.Storages.EOS.Keytab, "single_username": cfg.Reva.Storages.EOS.SingleUsername, + "enable_home": true, + "user_layout": cfg.Reva.Storages.EOS.Layout, }, "local": map[string]interface{}{ "root": cfg.Reva.Storages.Local.Root, diff --git a/pkg/command/storagehomedata.go b/pkg/command/storagehomedata.go index 8004d05..3f31e84 100644 --- a/pkg/command/storagehomedata.go +++ b/pkg/command/storagehomedata.go @@ -100,6 +100,8 @@ func StorageHomeData(cfg *config.Config) *cli.Command { "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, "keytab": cfg.Reva.Storages.EOS.Keytab, "single_username": cfg.Reva.Storages.EOS.SingleUsername, + "enable_home": cfg.Reva.Storages.EOS.EnableHome, + "user_layout": cfg.Reva.Storages.EOS.Layout, }, "local": map[string]interface{}{ "root": cfg.Reva.Storages.Local.Root, diff --git a/pkg/command/storageoc.go b/pkg/command/storageoc.go index 7c5c847..3f86191 100644 --- a/pkg/command/storageoc.go +++ b/pkg/command/storageoc.go @@ -99,6 +99,8 @@ func StorageOC(cfg *config.Config) *cli.Command { "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, "keytab": cfg.Reva.Storages.EOS.Keytab, "single_username": cfg.Reva.Storages.EOS.SingleUsername, + "enable_home": cfg.Reva.Storages.EOS.EnableHome, + "user_layout": cfg.Reva.Storages.EOS.Layout, }, "local": map[string]interface{}{ "root": cfg.Reva.Storages.Local.Root, diff --git a/pkg/command/storageocdata.go b/pkg/command/storageocdata.go index e1e124e..109859d 100644 --- a/pkg/command/storageocdata.go +++ b/pkg/command/storageocdata.go @@ -100,6 +100,8 @@ func StorageOCData(cfg *config.Config) *cli.Command { "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, "keytab": cfg.Reva.Storages.EOS.Keytab, "single_username": cfg.Reva.Storages.EOS.SingleUsername, + "enable_home": cfg.Reva.Storages.EOS.EnableHome, + "user_layout": cfg.Reva.Storages.EOS.Layout, }, "local": map[string]interface{}{ "root": cfg.Reva.Storages.Local.Root, diff --git a/pkg/command/storageroot.go b/pkg/command/storageroot.go index 23f0062..935c697 100644 --- a/pkg/command/storageroot.go +++ b/pkg/command/storageroot.go @@ -99,6 +99,8 @@ func StorageRoot(cfg *config.Config) *cli.Command { "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, "keytab": cfg.Reva.Storages.EOS.Keytab, "single_username": cfg.Reva.Storages.EOS.SingleUsername, + "enable_home": cfg.Reva.Storages.EOS.EnableHome, + "user_layout": cfg.Reva.Storages.EOS.Layout, }, "local": map[string]interface{}{ "root": cfg.Reva.Storages.Local.Root,