From 19420b8454e1eab6851fa02a0e9b33ad815857ac Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 19 Aug 2019 11:33:41 +0200 Subject: [PATCH 1/2] Update profile defaults --- profile/defaults.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/profile/defaults.go b/profile/defaults.go index 2c700645..272ed7e3 100644 --- a/profile/defaults.go +++ b/profile/defaults.go @@ -17,13 +17,12 @@ func makeDefaultFallbackProfile() *Profile { Name: "Fallback Profile", Flags: map[uint8]uint8{ // Profile Modes - Blacklist: status.SecurityLevelDynamic, - Prompt: status.SecurityLevelSecure, + Blacklist: status.SecurityLevelsDynamicAndSecure, Whitelist: status.SecurityLevelFortress, // Network Locations - Internet: status.SecurityLevelsDynamicAndSecure, - LAN: status.SecurityLevelsDynamicAndSecure, + Internet: status.SecurityLevelsAll, + LAN: status.SecurityLevelDynamic, Localhost: status.SecurityLevelsAll, // Specials From d5022a1ffc663b46d68d275c3299ca39f2e5ab62 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 19 Aug 2019 17:13:32 +0200 Subject: [PATCH 2/2] Fix setting data root in startup procedure --- core/base.go | 5 ++++- main.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/base.go b/core/base.go index a3e823ba..b65b4420 100644 --- a/core/base.go +++ b/core/base.go @@ -4,6 +4,8 @@ import ( "errors" "flag" + "github.com/safing/portbase/config" + "github.com/safing/portbase/api" "github.com/safing/portbase/database/dbmodule" "github.com/safing/portbase/modules" @@ -43,8 +45,9 @@ func prepBase() error { return err } - // set database location + // set data location dbmodule.SetDatabaseLocation("", structure.Root()) + config.SetDataRoot(structure.Root()) // init config logFlagOverrides() diff --git a/main.go b/main.go index 18dc4377..8e76d615 100644 --- a/main.go +++ b/main.go @@ -33,7 +33,7 @@ func init() { func main() { // Set Info - info.Set("Portmaster", "0.3.8", "AGPLv3", true) + info.Set("Portmaster", "0.3.9", "AGPLv3", true) // Start err := modules.Start()