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

fix eos config
This commit is contained in:
Michael Barz
2020-03-31 14:35:03 +02:00
committed by GitHub
6 changed files with 15 additions and 0 deletions

View File

@@ -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

View File

@@ -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,

View File

@@ -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,

View File

@@ -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,

View File

@@ -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,

View File

@@ -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,