Merge pull request #125 from butonic/fix-eos-config

fix eos config
owncloud · Mar 31, 2020 · ee6cd5b · ee6cd5b
2 parents a61bc82 + 9ef0093
commit ee6cd5b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 0 deletions.
diff --git a/changelog/unreleased/fix-eos-config.md 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,