mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-12 22:39:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

add missing configs

Browse Source
This commit is contained in:
David Christofas
2022-04-25 11:41:55 +02:00
parent b26b68b943
commit c29f69d26b
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/auth-machine/pkg/command/command.go
+2 -1
View File
@@ -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,
},
},
},
extensions/sharing/pkg/command/command.go
+2 -1
View File
@@ -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,
extensions/storage-metadata/pkg/config/defaults/defaultconfig.go
+7 -5
View File
@@ -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",
},
},
}
extensions/storage-users/pkg/config/defaults/defaultconfig.go
+2
View File
@@ -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{