From a36972cea474375b2b1cc2c292718691f06426de Mon Sep 17 00:00:00 2001
From: Daniel <dhaavi@users.noreply.github.com>
Date: Thu, 28 May 2020 10:11:21 +0200
Subject: [PATCH] Enable subdomain filtering by default

Also, streamline security level validation formats
---
 profile/config.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/profile/config.go b/profile/config.go
index 494bdc7a..13b4f81f 100644
--- a/profile/config.go
+++ b/profile/config.go
@@ -210,7 +210,7 @@ Examples:
 		OptType:         config.OptTypeInt,
 		ExternalOptType: "security level",
 		DefaultValue:    status.SecurityLevelsAll,
-		ValidationRegex: "^(7|6|4)$",
+		ValidationRegex: "^(4|6|7)$",
 		ExpertiseLevel:  config.ExpertiseLevelExpert,
 	})
 	if err != nil {
@@ -221,14 +221,14 @@ Examples:
 
 	// Include subdomains
 	err = config.Register(&config.Option{
-		Name:            "Filter SubDomains",
+		Name:            "Filter Subdomains",
 		Key:             CfgOptionFilterSubDomainsKey,
-		Description:     "Also filter sub-domains if a parent domain is blocked by a filter list",
+		Description:     "Also filter a domain if any parent domain is blocked by a filter list",
 		Order:           cfgOptionFilterSubDomainsOrder,
 		OptType:         config.OptTypeInt,
 		ExternalOptType: "security level",
-		DefaultValue:    status.SecurityLevelOff,
-		ValidationRegex: "^(0|4|6|7)$",
+		DefaultValue:    status.SecurityLevelsAll,
+		ValidationRegex: "^(4|6|7)$",
 	})
 	if err != nil {
 		return err
@@ -351,7 +351,7 @@ Examples:
 		ReleaseLevel:    config.ReleaseLevelBeta,
 		ExternalOptType: "security level",
 		DefaultValue:    status.SecurityLevelsAll,
-		ValidationRegex: "^(7|6|4)$",
+		ValidationRegex: "^(4|6|7)$",
 	})
 	if err != nil {
 		return err
@@ -370,7 +370,7 @@ Examples:
 		ReleaseLevel:    config.ReleaseLevelBeta,
 		ExternalOptType: "security level",
 		DefaultValue:    status.SecurityLevelsAll,
-		ValidationRegex: "^(7|6|4)$",
+		ValidationRegex: "^(4|6|7)$",
 	})
 	if err != nil {
 		return err
@@ -388,7 +388,7 @@ Examples:
 		ReleaseLevel:    config.ReleaseLevelBeta,
 		ExternalOptType: "security level",
 		DefaultValue:    status.SecurityLevelsAll,
-		ValidationRegex: "^(7|6|4)",
+		ValidationRegex: "^(4|6|7)",
 	})
 	if err != nil {
 		return err