add missing configs

owncloud · Apr 25, 2022 · 985a0ef · 985a0ef
1 parent e6d259b
commit 985a0ef
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -83,13 +83,15 @@ 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"),
 				ShareFolder:                "/Shares",
 				UserLayout:                 "{{.Id.OpaqueId}}",
 				PersonalSpaceAliasTemplate: "{{.SpaceType}}/{{.User.Username | lower}}",
 				GeneralSpaceAliasTemplate:  "{{.SpaceType}}/{{.SpaceName | replace \" \" \"-\" | lower}}",
+				PermissionsEndpoint:        "127.0.0.1:9191",
 			},
 		},
 		Events: config.Events{