github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'v2.0' into feature/installer-migration

Browse Source
This commit is contained in:
Alexandr Stelnykovych
2025-03-13 16:37:13 +02:00
parent 009ad6b2f1 453a8ff0ba
commit 5c38035f14
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmds/hub/main.go
View File

@@ -90,6 +90,5 @@ func initializeGlobals(cmd *cobra.Command, args []string) {
BinariesIndexURLs: configure.DefaultStableBinaryIndexURLs,
IntelIndexURLs: configure.DefaultIntelIndexURLs,
VerifyBinaryUpdates: configure.BinarySigningTrustStore,
VerifyIntelUpdates: configure.BinarySigningTrustStore,
}
}

1
cmds/observation-hub/main.go
View File

@@ -111,6 +111,5 @@ func initializeGlobals(cmd *cobra.Command, args []string) {
BinariesIndexURLs: configure.DefaultStableBinaryIndexURLs,
IntelIndexURLs: configure.DefaultIntelIndexURLs,
VerifyBinaryUpdates: configure.BinarySigningTrustStore,
VerifyIntelUpdates: configure.BinarySigningTrustStore,
}
}

6
cmds/portmaster-core/main.go
View File

@@ -14,6 +14,7 @@ import (
"github.com/safing/portmaster/service"
"github.com/safing/portmaster/service/configure"
"github.com/safing/portmaster/service/updates"
"github.com/safing/portmaster/spn/conf"
)
var (
@@ -76,6 +77,10 @@ func initializeGlobals(cmd *cobra.Command, args []string) {
// Configure user agent.
updates.UserAgent = fmt.Sprintf("Portmaster Core (%s %s)", runtime.GOOS, runtime.GOARCH)
// Enable SPN client mode
conf.EnableClient(true)
conf.EnableIntegration(true)
// Configure service.
cmdbase.SvcFactory = func(svcCfg *service.ServiceConfig) (cmdbase.ServiceInstance, error) {
svc, err := service.New(svcCfg)
@@ -92,7 +97,6 @@ func initializeGlobals(cmd *cobra.Command, args []string) {
BinariesIndexURLs: configure.DefaultStableBinaryIndexURLs,
IntelIndexURLs: configure.DefaultIntelIndexURLs,
VerifyBinaryUpdates: configure.BinarySigningTrustStore,
VerifyIntelUpdates: configure.BinarySigningTrustStore,
}
}