From b922f76060257e763d764d8a3d38c3b60024e639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 26 Jun 2020 15:53:41 +0200 Subject: [PATCH] fix eos-home config (#304) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix eos-home config Signed-off-by: Jörn Friedrich Dreyer * update reva to v0.1.1-0.20200626111234-e21c32db9614 Signed-off-by: Jörn Friedrich Dreyer --- go.mod | 2 +- go.sum | 2 ++ pkg/command/gateway.go | 8 ++++---- pkg/command/storageeos.go | 19 ++++++++++++++++++- pkg/command/storageeosdata.go | 19 ++++++++++++++++++- pkg/command/storagehome.go | 19 ++++++++++++++++++- pkg/command/storagehomedata.go | 21 +++++++++++++++++++-- pkg/command/storageoc.go | 19 ++++++++++++++++++- pkg/command/storageocdata.go | 19 ++++++++++++++++++- pkg/command/storageroot.go | 21 ++++++++++++++++++++- pkg/flagset/gateway.go | 11 ++++++++++- pkg/flagset/storagehome.go | 4 +++- 12 files changed, 149 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 39472cec2..aa98b01b1 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/owncloud/ocis-reva go 1.13 require ( - github.com/cs3org/reva v0.1.1-0.20200626083045-8d345749ae0d + github.com/cs3org/reva v0.1.1-0.20200626111234-e21c32db9614 github.com/gofrs/uuid v3.3.0+incompatible github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 // indirect diff --git a/go.sum b/go.sum index 1f87603c7..3d122baa5 100644 --- a/go.sum +++ b/go.sum @@ -192,6 +192,8 @@ github.com/cs3org/reva v0.1.1-0.20200625144447-03e6aba90379 h1:IvAcfPZ7Ii9KAPBGL github.com/cs3org/reva v0.1.1-0.20200625144447-03e6aba90379/go.mod h1:qmaOljVCmm3kcRS8RW5E34Voly4dDCFdlllj/j4KW/0= github.com/cs3org/reva v0.1.1-0.20200626083045-8d345749ae0d h1:SCUMOhkYTEjFA7IsMlj49bF+cCgTEbfnBme0VFqOhuc= github.com/cs3org/reva v0.1.1-0.20200626083045-8d345749ae0d/go.mod h1:wunIwvRI7Pd+QFB0YCK+jdAtq0udQzjt8iG7WQ+LLrs= +github.com/cs3org/reva v0.1.1-0.20200626111234-e21c32db9614 h1:FAk15Sgy59cuPL9M7HEIq0/KX+hTJWFa013ALJHDKcQ= +github.com/cs3org/reva v0.1.1-0.20200626111234-e21c32db9614/go.mod h1:wunIwvRI7Pd+QFB0YCK+jdAtq0udQzjt8iG7WQ+LLrs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/pkg/command/gateway.go b/pkg/command/gateway.go index 08d8201de..842063bcd 100644 --- a/pkg/command/gateway.go +++ b/pkg/command/gateway.go @@ -130,10 +130,10 @@ func Gateway(cfg *config.Config) *cli.Command { "static": map[string]interface{}{ "home_provider": cfg.Reva.Gateway.HomeProvider, "rules": map[string]interface{}{ - cfg.Reva.StorageRoot.MountPath: cfg.Reva.StorageRoot.URL, - cfg.Reva.StorageRoot.MountID: cfg.Reva.StorageRoot.URL, - cfg.Reva.StorageHome.MountPath: cfg.Reva.StorageHome.URL, - // the home storage has no mount id. In responses it returns the mount id of the actual storage + cfg.Reva.StorageRoot.MountPath: cfg.Reva.StorageRoot.URL, + cfg.Reva.StorageRoot.MountID: cfg.Reva.StorageRoot.URL, + cfg.Reva.StorageHome.MountPath: cfg.Reva.StorageHome.URL, + cfg.Reva.StorageHome.MountID: cfg.Reva.StorageHome.URL, cfg.Reva.StorageEOS.MountPath: cfg.Reva.StorageEOS.URL, cfg.Reva.StorageEOS.MountID: cfg.Reva.StorageEOS.URL, cfg.Reva.StorageOC.MountPath: cfg.Reva.StorageOC.URL, diff --git a/pkg/command/storageeos.go b/pkg/command/storageeos.go index 04ef99807..15c79ef94 100644 --- a/pkg/command/storageeos.go +++ b/pkg/command/storageeos.go @@ -105,7 +105,24 @@ func StorageEOS(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, + }, + "eoshome": map[string]interface{}{ + "namespace": cfg.Reva.Storages.EOS.Namespace, + "shadow_namespace": cfg.Reva.Storages.EOS.ShadowNamespace, + "share_folder": cfg.Reva.Storages.EOS.ShareFolder, + "eos_binary": cfg.Reva.Storages.EOS.EosBinary, + "xrdcopy_binary": cfg.Reva.Storages.EOS.XrdcopyBinary, + "master_url": cfg.Reva.Storages.EOS.MasterURL, + "slave_url": cfg.Reva.Storages.EOS.SlaveURL, + "cache_directory": cfg.Reva.Storages.EOS.CacheDirectory, + "enable_logging": cfg.Reva.Storages.EOS.EnableLogging, + "show_hidden_sys_files": cfg.Reva.Storages.EOS.ShowHiddenSysFiles, + "force_single_user_mode": cfg.Reva.Storages.EOS.ForceSingleUserMode, + "use_keytab": cfg.Reva.Storages.EOS.UseKeytab, + "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, + "keytab": cfg.Reva.Storages.EOS.Keytab, + "single_username": cfg.Reva.Storages.EOS.SingleUsername, "user_layout": cfg.Reva.Storages.EOS.Layout, }, }, diff --git a/pkg/command/storageeosdata.go b/pkg/command/storageeosdata.go index eee78a925..019af0390 100644 --- a/pkg/command/storageeosdata.go +++ b/pkg/command/storageeosdata.go @@ -107,7 +107,24 @@ func StorageEOSData(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, + }, + "eoshome": map[string]interface{}{ + "namespace": cfg.Reva.Storages.EOS.Namespace, + "shadow_namespace": cfg.Reva.Storages.EOS.ShadowNamespace, + "share_folder": cfg.Reva.Storages.EOS.ShareFolder, + "eos_binary": cfg.Reva.Storages.EOS.EosBinary, + "xrdcopy_binary": cfg.Reva.Storages.EOS.XrdcopyBinary, + "master_url": cfg.Reva.Storages.EOS.MasterURL, + "slave_url": cfg.Reva.Storages.EOS.SlaveURL, + "cache_directory": cfg.Reva.Storages.EOS.CacheDirectory, + "enable_logging": cfg.Reva.Storages.EOS.EnableLogging, + "show_hidden_sys_files": cfg.Reva.Storages.EOS.ShowHiddenSysFiles, + "force_single_user_mode": cfg.Reva.Storages.EOS.ForceSingleUserMode, + "use_keytab": cfg.Reva.Storages.EOS.UseKeytab, + "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, + "keytab": cfg.Reva.Storages.EOS.Keytab, + "single_username": cfg.Reva.Storages.EOS.SingleUsername, "user_layout": cfg.Reva.Storages.EOS.Layout, }, }, diff --git a/pkg/command/storagehome.go b/pkg/command/storagehome.go index 7e0f583a9..69f534375 100644 --- a/pkg/command/storagehome.go +++ b/pkg/command/storagehome.go @@ -105,7 +105,24 @@ 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, + }, + "eoshome": map[string]interface{}{ + "namespace": cfg.Reva.Storages.EOS.Namespace, + "shadow_namespace": cfg.Reva.Storages.EOS.ShadowNamespace, + "share_folder": cfg.Reva.Storages.EOS.ShareFolder, + "eos_binary": cfg.Reva.Storages.EOS.EosBinary, + "xrdcopy_binary": cfg.Reva.Storages.EOS.XrdcopyBinary, + "master_url": cfg.Reva.Storages.EOS.MasterURL, + "slave_url": cfg.Reva.Storages.EOS.SlaveURL, + "cache_directory": cfg.Reva.Storages.EOS.CacheDirectory, + "enable_logging": cfg.Reva.Storages.EOS.EnableLogging, + "show_hidden_sys_files": cfg.Reva.Storages.EOS.ShowHiddenSysFiles, + "force_single_user_mode": cfg.Reva.Storages.EOS.ForceSingleUserMode, + "use_keytab": cfg.Reva.Storages.EOS.UseKeytab, + "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, + "keytab": cfg.Reva.Storages.EOS.Keytab, + "single_username": cfg.Reva.Storages.EOS.SingleUsername, "user_layout": cfg.Reva.Storages.EOS.Layout, }, "local": map[string]interface{}{ diff --git a/pkg/command/storagehomedata.go b/pkg/command/storagehomedata.go index a00657bd1..1f11b1811 100644 --- a/pkg/command/storagehomedata.go +++ b/pkg/command/storagehomedata.go @@ -93,9 +93,27 @@ func StorageHomeData(cfg *config.Config) *cli.Command { "drivers": map[string]interface{}{ "eos": map[string]interface{}{ "namespace": cfg.Reva.Storages.EOS.Namespace, - "eos_binary": cfg.Reva.Storages.EOS.EosBinary, "shadow_namespace": cfg.Reva.Storages.EOS.ShadowNamespace, "share_folder": cfg.Reva.Storages.EOS.ShareFolder, + "eos_binary": cfg.Reva.Storages.EOS.EosBinary, + "xrdcopy_binary": cfg.Reva.Storages.EOS.XrdcopyBinary, + "master_url": cfg.Reva.Storages.EOS.MasterURL, + "slave_url": cfg.Reva.Storages.EOS.SlaveURL, + "cache_directory": cfg.Reva.Storages.EOS.CacheDirectory, + "enable_logging": cfg.Reva.Storages.EOS.EnableLogging, + "show_hidden_sys_files": cfg.Reva.Storages.EOS.ShowHiddenSysFiles, + "force_single_user_mode": cfg.Reva.Storages.EOS.ForceSingleUserMode, + "use_keytab": cfg.Reva.Storages.EOS.UseKeytab, + "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, + "keytab": cfg.Reva.Storages.EOS.Keytab, + "single_username": cfg.Reva.Storages.EOS.SingleUsername, + "user_layout": cfg.Reva.Storages.EOS.Layout, + }, + "eoshome": map[string]interface{}{ + "namespace": cfg.Reva.Storages.EOS.Namespace, + "shadow_namespace": cfg.Reva.Storages.EOS.ShadowNamespace, + "share_folder": cfg.Reva.Storages.EOS.ShareFolder, + "eos_binary": cfg.Reva.Storages.EOS.EosBinary, "xrdcopy_binary": cfg.Reva.Storages.EOS.XrdcopyBinary, "master_url": cfg.Reva.Storages.EOS.MasterURL, "slave_url": cfg.Reva.Storages.EOS.SlaveURL, @@ -107,7 +125,6 @@ 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{}{ diff --git a/pkg/command/storageoc.go b/pkg/command/storageoc.go index 34b24e43d..60b940a40 100644 --- a/pkg/command/storageoc.go +++ b/pkg/command/storageoc.go @@ -105,7 +105,24 @@ 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, + }, + "eoshome": map[string]interface{}{ + "namespace": cfg.Reva.Storages.EOS.Namespace, + "shadow_namespace": cfg.Reva.Storages.EOS.ShadowNamespace, + "share_folder": cfg.Reva.Storages.EOS.ShareFolder, + "eos_binary": cfg.Reva.Storages.EOS.EosBinary, + "xrdcopy_binary": cfg.Reva.Storages.EOS.XrdcopyBinary, + "master_url": cfg.Reva.Storages.EOS.MasterURL, + "slave_url": cfg.Reva.Storages.EOS.SlaveURL, + "cache_directory": cfg.Reva.Storages.EOS.CacheDirectory, + "enable_logging": cfg.Reva.Storages.EOS.EnableLogging, + "show_hidden_sys_files": cfg.Reva.Storages.EOS.ShowHiddenSysFiles, + "force_single_user_mode": cfg.Reva.Storages.EOS.ForceSingleUserMode, + "use_keytab": cfg.Reva.Storages.EOS.UseKeytab, + "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, + "keytab": cfg.Reva.Storages.EOS.Keytab, + "single_username": cfg.Reva.Storages.EOS.SingleUsername, "user_layout": cfg.Reva.Storages.EOS.Layout, }, "local": map[string]interface{}{ diff --git a/pkg/command/storageocdata.go b/pkg/command/storageocdata.go index dd3a2be14..e171da587 100644 --- a/pkg/command/storageocdata.go +++ b/pkg/command/storageocdata.go @@ -107,7 +107,24 @@ 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, + }, + "eoshome": map[string]interface{}{ + "namespace": cfg.Reva.Storages.EOS.Namespace, + "shadow_namespace": cfg.Reva.Storages.EOS.ShadowNamespace, + "share_folder": cfg.Reva.Storages.EOS.ShareFolder, + "eos_binary": cfg.Reva.Storages.EOS.EosBinary, + "xrdcopy_binary": cfg.Reva.Storages.EOS.XrdcopyBinary, + "master_url": cfg.Reva.Storages.EOS.MasterURL, + "slave_url": cfg.Reva.Storages.EOS.SlaveURL, + "cache_directory": cfg.Reva.Storages.EOS.CacheDirectory, + "enable_logging": cfg.Reva.Storages.EOS.EnableLogging, + "show_hidden_sys_files": cfg.Reva.Storages.EOS.ShowHiddenSysFiles, + "force_single_user_mode": cfg.Reva.Storages.EOS.ForceSingleUserMode, + "use_keytab": cfg.Reva.Storages.EOS.UseKeytab, + "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, + "keytab": cfg.Reva.Storages.EOS.Keytab, + "single_username": cfg.Reva.Storages.EOS.SingleUsername, "user_layout": cfg.Reva.Storages.EOS.Layout, }, "local": map[string]interface{}{ diff --git a/pkg/command/storageroot.go b/pkg/command/storageroot.go index a2fa370d0..c562743d2 100644 --- a/pkg/command/storageroot.go +++ b/pkg/command/storageroot.go @@ -91,6 +91,26 @@ func StorageRoot(cfg *config.Config) *cli.Command { "drivers": map[string]interface{}{ "eos": map[string]interface{}{ "namespace": cfg.Reva.Storages.EOS.Namespace, + "shadow_namespace": cfg.Reva.Storages.EOS.ShadowNamespace, + "share_folder": cfg.Reva.Storages.EOS.ShareFolder, + "eos_binary": cfg.Reva.Storages.EOS.EosBinary, + "xrdcopy_binary": cfg.Reva.Storages.EOS.XrdcopyBinary, + "master_url": cfg.Reva.Storages.EOS.MasterURL, + "slave_url": cfg.Reva.Storages.EOS.SlaveURL, + "cache_directory": cfg.Reva.Storages.EOS.CacheDirectory, + "enable_logging": cfg.Reva.Storages.EOS.EnableLogging, + "show_hidden_sys_files": cfg.Reva.Storages.EOS.ShowHiddenSysFiles, + "force_single_user_mode": cfg.Reva.Storages.EOS.ForceSingleUserMode, + "use_keytab": cfg.Reva.Storages.EOS.UseKeytab, + "sec_protocol": cfg.Reva.Storages.EOS.SecProtocol, + "keytab": cfg.Reva.Storages.EOS.Keytab, + "single_username": cfg.Reva.Storages.EOS.SingleUsername, + "user_layout": cfg.Reva.Storages.EOS.Layout, + }, + "eoshome": map[string]interface{}{ + "namespace": cfg.Reva.Storages.EOS.Namespace, + "shadow_namespace": cfg.Reva.Storages.EOS.ShadowNamespace, + "share_folder": cfg.Reva.Storages.EOS.ShareFolder, "eos_binary": cfg.Reva.Storages.EOS.EosBinary, "xrdcopy_binary": cfg.Reva.Storages.EOS.XrdcopyBinary, "master_url": cfg.Reva.Storages.EOS.MasterURL, @@ -103,7 +123,6 @@ 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{}{ diff --git a/pkg/flagset/gateway.go b/pkg/flagset/gateway.go index 73b59be37..6ca1bb378 100644 --- a/pkg/flagset/gateway.go +++ b/pkg/flagset/gateway.go @@ -265,7 +265,16 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag { EnvVars: []string{"REVA_STORAGE_HOME_MOUNT_PATH"}, Destination: &cfg.Reva.StorageHome.MountPath, }, - // The home storage has no mount id. In responses it returns the mount id of the actual storage + &cli.StringFlag{ + Name: "storage-home-mount-id", + // This is tho mount id of the /oc storage + // set it to 1284d238-aa92-42ce-bdc4-0b0000009158 for /eos + // Value: "1284d238-aa92-42ce-bdc4-0b0000009162", /os + Value: "1284d238-aa92-42ce-bdc4-0b0000009154", // /home + Usage: "mount id", + EnvVars: []string{"REVA_STORAGE_HOME_MOUNT_ID"}, + Destination: &cfg.Reva.StorageHome.MountID, + }, &cli.StringFlag{ Name: "storage-eos-url", diff --git a/pkg/flagset/storagehome.go b/pkg/flagset/storagehome.go index 4c5cc8d50..fcfd59552 100644 --- a/pkg/flagset/storagehome.go +++ b/pkg/flagset/storagehome.go @@ -141,7 +141,9 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag { Name: "mount-id", // This is tho mount id of the /oc storage // set it to 1284d238-aa92-42ce-bdc4-0b0000009158 for /eos - Value: "1284d238-aa92-42ce-bdc4-0b0000009162", + // Value: "1284d238-aa92-42ce-bdc4-0b0000009162", /os + + Value: "1284d238-aa92-42ce-bdc4-0b0000009154", // /home Usage: "mount id", EnvVars: []string{"REVA_STORAGE_HOME_MOUNT_ID"}, Destination: &cfg.Reva.StorageHome.MountID,