mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

use machine auth secret from common config

Browse Source
This commit is contained in:
Willy Kloucek
2022-04-27 14:40:53 +02:00
parent b3f55765d8
commit f74d1e27c1
8 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,7 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
cfg.TransferSecret = cfg.Commons.TransferSecret
} else {
} else if cfg.TransferSecret == "" {
log.Fatalf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

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

@@ -105,7 +105,7 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
cfg.TransferSecret = cfg.Commons.TransferSecret
} else {
} else if cfg.TransferSecret == "" {
log.Fatalf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

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

@@ -55,7 +55,7 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.Notifications.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.Notifications.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else {
} else if cfg.Notifications.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

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

@@ -92,7 +92,7 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else {
} else if cfg.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

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

@@ -188,7 +188,7 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else {
} else if cfg.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}

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

@@ -95,7 +95,7 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.Metadata.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else {
} else if cfg.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}

15
extensions/sharing/pkg/config/defaults/defaultconfig.go
View File

@@ -1,6 +1,7 @@
package defaults
import (
"log"
"path/filepath"
"github.com/owncloud/ocis/extensions/sharing/pkg/config"
@@ -114,13 +115,25 @@ func EnsureDefaults(cfg *config.Config) {
cfg.Reva = &config.Reva{}
}
if cfg.TokenManager == nil && cfg.Commons != nil && cfg.Commons.TokenManager != nil {
if cfg.TokenManager == nil && cfg.Commons != nil && cfg.Commons.TokenManager != nil {
cfg.TokenManager = &config.TokenManager{
JWTSecret: cfg.Commons.TokenManager.JWTSecret,
}
} else if cfg.TokenManager == nil {
cfg.TokenManager = &config.TokenManager{}
}
if cfg.UserSharingDrivers.CS3.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.UserSharingDrivers.CS3.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.UserSharingDrivers.CS3.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key for the cs3 user sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
}
if cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey
} else if cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey == "" {
log.Fatalf("machine auth api key for the cs3 public sharing driver is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}
func Sanitize(cfg *config.Config) {

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

@@ -76,7 +76,7 @@ func EnsureDefaults(cfg *config.Config) {
if cfg.Thumbnail.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
cfg.Thumbnail.TransferSecret = cfg.Commons.TransferSecret
} else {
} else if cfg.TransferSecret == "" {
log.Fatalf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
}
}