mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-25 15:09:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

align more storage-system names (#3674)

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2022-05-04 13:19:35 +00:00
committed by GitHub
parent ebf39a6a90
commit 2bd63509e3
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/settings/pkg/config/defaults/defaultconfig.go
View File

@@ -50,7 +50,7 @@ func DefaultConfig() *config.Config {
},
Metadata: config.Metadata{
GatewayAddress: "127.0.0.1:9215", // metadata storage
GatewayAddress: "127.0.0.1:9215", // system storage
StorageAddress: "127.0.0.1:9215",
ServiceUserIDP: "internal",
},

2
extensions/storage-system/pkg/command/server.go
View File

@@ -47,7 +47,7 @@ func Server(cfg *config.Config) *cli.Command {
pidFile := path.Join(os.TempDir(), "revad-"+cfg.Service.Name+"-"+uuid.Must(uuid.NewV4()).String()+".pid")
rcfg := revaconfig.StorageMetadataFromStruct(cfg)
rcfg := revaconfig.StorageSystemFromStruct(cfg)
gr.Add(func() error {
runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))

4
extensions/storage-system/pkg/revaconfig/config.go
View File

@@ -5,8 +5,8 @@ import (
"github.com/owncloud/ocis/extensions/storage-system/pkg/config"
)
// StorageMetadataFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
func StorageMetadataFromStruct(cfg *config.Config) map[string]interface{} {
// StorageSystemFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
func StorageSystemFromStruct(cfg *config.Config) map[string]interface{} {
rcfg := map[string]interface{}{
"core": map[string]interface{}{
"tracing_enabled": cfg.Tracing.Enabled,

4
ocis/pkg/init/init.go
View File

@@ -110,7 +110,7 @@ type OcisConfig struct {
AuthBearer AuthbearerExtension `yaml:"auth_bearer"`
User UserAndGroupExtension
Group UserAndGroupExtension
StorageMetadata DataProviderInsecureSettings `yaml:"storage_system"`
StorageSystem DataProviderInsecureSettings `yaml:"storage_system"`
StorageUsers DataProviderInsecureSettings `yaml:"storage_users"`
Ocdav InsecureExtension
Thumbnails ThumbNailExtension
@@ -271,7 +271,7 @@ func CreateConfig(insecure, forceOverwrite bool, configPath, adminPassword strin
cfg.Proxy = InsecureProxyExtension{
Insecure_backends: true,
}
cfg.StorageMetadata = DataProviderInsecureSettings{
cfg.StorageSystem = DataProviderInsecureSettings{
Data_provider_insecure: true,
}
cfg.StorageUsers = DataProviderInsecureSettings{