From 985a0ef6ef4c177ed82dc570e3688ff171f3d94b Mon Sep 17 00:00:00 2001 From: David Christofas Date: Mon, 25 Apr 2022 11:41:55 +0200 Subject: [PATCH] add missing configs --- extensions/auth-machine/pkg/command/command.go | 3 ++- extensions/sharing/pkg/command/command.go | 3 ++- .../pkg/config/defaults/defaultconfig.go | 12 +++++++----- .../pkg/config/defaults/defaultconfig.go | 2 ++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/extensions/auth-machine/pkg/command/command.go b/extensions/auth-machine/pkg/command/command.go index 6248955489e..332c1ed8656 100644 --- a/extensions/auth-machine/pkg/command/command.go +++ b/extensions/auth-machine/pkg/command/command.go @@ -107,7 +107,8 @@ func authMachineConfigFromStruct(c *cli.Context, cfg *config.Config) map[string] "auth_manager": "machine", "auth_managers": map[string]interface{}{ "machine": map[string]interface{}{ - "api_key": cfg.AuthProviders.Machine.APIKey, + "api_key": cfg.AuthProviders.Machine.APIKey, + "gateway_addr": cfg.GatewayEndpoint, }, }, }, diff --git a/extensions/sharing/pkg/command/command.go b/extensions/sharing/pkg/command/command.go index 614e3e87c5b..807b24132be 100644 --- a/extensions/sharing/pkg/command/command.go +++ b/extensions/sharing/pkg/command/command.go @@ -155,7 +155,8 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte "driver": cfg.PublicSharingDriver, "drivers": map[string]interface{}{ "json": map[string]interface{}{ - "file": cfg.PublicSharingDrivers.JSON.File, + "file": cfg.PublicSharingDrivers.JSON.File, + "gateway_addr": cfg.GatewayEndpoint, }, "sql": map[string]interface{}{ "db_username": cfg.PublicSharingDrivers.SQL.DBUsername, diff --git a/extensions/storage-metadata/pkg/config/defaults/defaultconfig.go b/extensions/storage-metadata/pkg/config/defaults/defaultconfig.go index c2fe1298ced..298d31eb564 100644 --- a/extensions/storage-metadata/pkg/config/defaults/defaultconfig.go +++ b/extensions/storage-metadata/pkg/config/defaults/defaultconfig.go @@ -68,13 +68,15 @@ func DefaultConfig() *config.Config { Region: "default", }, S3NG: config.S3NGDriver{ - Root: filepath.Join(defaults.BaseDataPath(), "storage", "metadata"), - UserLayout: "{{.Id.OpaqueId}}", - Region: "default", + Root: filepath.Join(defaults.BaseDataPath(), "storage", "metadata"), + UserLayout: "{{.Id.OpaqueId}}", + Region: "default", + PermissionsEndpoint: "127.0.0.1:9191", }, OCIS: config.OCISDriver{ - Root: filepath.Join(defaults.BaseDataPath(), "storage", "metadata"), - UserLayout: "{{.Id.OpaqueId}}", + Root: filepath.Join(defaults.BaseDataPath(), "storage", "metadata"), + UserLayout: "{{.Id.OpaqueId}}", + PermissionsEndpoint: "127.0.0.1:9191", }, }, } diff --git a/extensions/storage-users/pkg/config/defaults/defaultconfig.go b/extensions/storage-users/pkg/config/defaults/defaultconfig.go index b7a74ac39a5..8dc305fced0 100644 --- a/extensions/storage-users/pkg/config/defaults/defaultconfig.go +++ b/extensions/storage-users/pkg/config/defaults/defaultconfig.go @@ -83,6 +83,7 @@ func DefaultConfig() *config.Config { Region: "default", PersonalSpaceAliasTemplate: "{{.SpaceType}}/{{.User.Username | lower}}", GeneralSpaceAliasTemplate: "{{.SpaceType}}/{{.SpaceName | replace \" \" \"-\" | lower}}", + PermissionsEndpoint: "127.0.0.1:9191", }, OCIS: config.OCISDriver{ Root: filepath.Join(defaults.BaseDataPath(), "storage", "users"), @@ -90,6 +91,7 @@ func DefaultConfig() *config.Config { UserLayout: "{{.Id.OpaqueId}}", PersonalSpaceAliasTemplate: "{{.SpaceType}}/{{.User.Username | lower}}", GeneralSpaceAliasTemplate: "{{.SpaceType}}/{{.SpaceName | replace \" \" \"-\" | lower}}", + PermissionsEndpoint: "127.0.0.1:9191", }, }, Events: config.Events{