mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-04-22 02:38:32 -05:00
update reva (#113)
* new ocis config Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * Change default settings to be able to run ocis server without any configuration - Konnectd uses no TLS as it is behind the proxy. - Glauth generates dev-certificates for ldap on startup if none is provided. - Glauth can launch unencrypted (9125) and encrypted (9126) port in parallel Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * allow configuring user sharing driver, default to json Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * update reva Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * switch to preferred_username as opaqueid Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * update drone config to override new defaults to match test environment Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * use latest reva Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * typo * use updatet api tests Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * core tests got merged already Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> * fix changelog Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
committed by
GitHub
GitHub
parent
37972e9a5f
commit
7ae8fc22f5
@@ -120,7 +120,7 @@ func Gateway(cfg *config.Config) *cli.Command {
|
||||
"driver": "static",
|
||||
"drivers": map[string]interface{}{
|
||||
"static": map[string]interface{}{
|
||||
"home_provider": cfg.Reva.StorageHome.MountPath,
|
||||
"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,
|
||||
|
||||
@@ -84,10 +84,10 @@ func Sharing(cfg *config.Config) *cli.Command {
|
||||
// TODO build services dynamically
|
||||
"services": map[string]interface{}{
|
||||
"usershareprovider": map[string]interface{}{
|
||||
"driver": "memory",
|
||||
"driver": cfg.Reva.Sharing.UserDriver,
|
||||
},
|
||||
"publicshareprovider": map[string]interface{}{
|
||||
"driver": "memory",
|
||||
"driver": cfg.Reva.Sharing.PublicDriver,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -107,6 +107,8 @@ func StorageHome(cfg *config.Config) *cli.Command {
|
||||
"datadirectory": cfg.Reva.Storages.OwnCloud.Datadirectory,
|
||||
"scan": cfg.Reva.Storages.OwnCloud.Scan,
|
||||
"redis": cfg.Reva.Storages.OwnCloud.Redis,
|
||||
"enable_home": true,
|
||||
"user_layout": cfg.Reva.Storages.OwnCloud.Layout,
|
||||
},
|
||||
"s3": map[string]interface{}{
|
||||
"region": cfg.Reva.Storages.S3.Region,
|
||||
@@ -120,12 +122,6 @@ func StorageHome(cfg *config.Config) *cli.Command {
|
||||
"mount_path": cfg.Reva.StorageHome.MountPath,
|
||||
"mount_id": cfg.Reva.StorageHome.MountID,
|
||||
"expose_data_server": cfg.Reva.StorageHome.ExposeDataServer,
|
||||
"path_wrapper": cfg.Reva.StorageHome.PathWrapper,
|
||||
"path_wrappers": map[string]interface{}{
|
||||
"context": map[string]interface{}{
|
||||
"prefix": cfg.Reva.StorageHome.PathWrapperContext.Prefix,
|
||||
},
|
||||
},
|
||||
// TODO use cfg.Reva.StorageHomeData.URL, ?
|
||||
"data_server_url": cfg.Reva.StorageHome.DataServerURL,
|
||||
"enable_home_creation": cfg.Reva.StorageHome.EnableHomeCreation,
|
||||
|
||||
@@ -108,6 +108,8 @@ func StorageHomeData(cfg *config.Config) *cli.Command {
|
||||
"datadirectory": cfg.Reva.Storages.OwnCloud.Datadirectory,
|
||||
"scan": cfg.Reva.Storages.OwnCloud.Scan,
|
||||
"redis": cfg.Reva.Storages.OwnCloud.Redis,
|
||||
"enable_home": cfg.Reva.Storages.OwnCloud.EnableHome,
|
||||
"user_layout": cfg.Reva.Storages.OwnCloud.Layout,
|
||||
},
|
||||
"s3": map[string]interface{}{
|
||||
"region": cfg.Reva.Storages.S3.Region,
|
||||
|
||||
@@ -107,7 +107,8 @@ func StorageOC(cfg *config.Config) *cli.Command {
|
||||
"datadirectory": cfg.Reva.Storages.OwnCloud.Datadirectory,
|
||||
"scan": cfg.Reva.Storages.OwnCloud.Scan,
|
||||
"redis": cfg.Reva.Storages.OwnCloud.Redis,
|
||||
"layout": cfg.Reva.Storages.OwnCloud.Layout,
|
||||
"enable_home": cfg.Reva.Storages.OwnCloud.EnableHome,
|
||||
"user_layout": cfg.Reva.Storages.OwnCloud.Layout,
|
||||
},
|
||||
"s3": map[string]interface{}{
|
||||
"region": cfg.Reva.Storages.S3.Region,
|
||||
@@ -121,12 +122,6 @@ func StorageOC(cfg *config.Config) *cli.Command {
|
||||
"mount_path": cfg.Reva.StorageOC.MountPath,
|
||||
"mount_id": cfg.Reva.StorageOC.MountID,
|
||||
"expose_data_server": cfg.Reva.StorageOC.ExposeDataServer,
|
||||
"path_wrapper": cfg.Reva.StorageOC.PathWrapper,
|
||||
"path_wrappers": map[string]interface{}{
|
||||
"context": map[string]interface{}{
|
||||
"prefix": cfg.Reva.StorageOC.PathWrapperContext.Prefix,
|
||||
},
|
||||
},
|
||||
// TODO use cfg.Reva.SStorageOCData.URL, ?
|
||||
"data_server_url": cfg.Reva.StorageOC.DataServerURL,
|
||||
"enable_home_creation": cfg.Reva.StorageOC.EnableHomeCreation,
|
||||
|
||||
@@ -108,6 +108,8 @@ func StorageOCData(cfg *config.Config) *cli.Command {
|
||||
"datadirectory": cfg.Reva.Storages.OwnCloud.Datadirectory,
|
||||
"scan": cfg.Reva.Storages.OwnCloud.Scan,
|
||||
"redis": cfg.Reva.Storages.OwnCloud.Redis,
|
||||
"enable_home": cfg.Reva.Storages.OwnCloud.EnableHome,
|
||||
"user_layout": cfg.Reva.Storages.OwnCloud.Layout,
|
||||
},
|
||||
"s3": map[string]interface{}{
|
||||
"region": cfg.Reva.Storages.S3.Region,
|
||||
|
||||
@@ -107,6 +107,8 @@ func StorageRoot(cfg *config.Config) *cli.Command {
|
||||
"datadirectory": cfg.Reva.Storages.OwnCloud.Datadirectory,
|
||||
"scan": cfg.Reva.Storages.OwnCloud.Scan,
|
||||
"redis": cfg.Reva.Storages.OwnCloud.Redis,
|
||||
"enable_home": cfg.Reva.Storages.OwnCloud.EnableHome,
|
||||
"user_layout": cfg.Reva.Storages.OwnCloud.Layout,
|
||||
},
|
||||
"s3": map[string]interface{}{
|
||||
"region": cfg.Reva.Storages.S3.Region,
|
||||
@@ -117,15 +119,9 @@ func StorageRoot(cfg *config.Config) *cli.Command {
|
||||
"prefix": cfg.Reva.Storages.S3.Prefix,
|
||||
},
|
||||
},
|
||||
"mount_path": cfg.Reva.StorageRoot.MountPath,
|
||||
"mount_id": cfg.Reva.StorageRoot.MountID,
|
||||
"expose_data_server": cfg.Reva.StorageRoot.ExposeDataServer,
|
||||
"path_wrapper": cfg.Reva.StorageRoot.PathWrapper,
|
||||
"path_wrappers": map[string]interface{}{
|
||||
"context": map[string]interface{}{
|
||||
"prefix": cfg.Reva.StorageRoot.PathWrapperContext.Prefix,
|
||||
},
|
||||
},
|
||||
"mount_path": cfg.Reva.StorageRoot.MountPath,
|
||||
"mount_id": cfg.Reva.StorageRoot.MountID,
|
||||
"expose_data_server": cfg.Reva.StorageRoot.ExposeDataServer,
|
||||
"data_server_url": cfg.Reva.StorageRoot.DataServerURL,
|
||||
"enable_home_creation": cfg.Reva.StorageRoot.EnableHomeCreation,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user