Merge branch 'develop' of github.com:safing/portmaster into develop

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()

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()

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