Enable subdomain filtering by default

Also, streamline security level validation formats
This commit is contained in:
Daniel
2020-05-28 10:11:21 +02:00
parent 9b4d853af3
commit a36972cea4

View File

@@ -210,7 +210,7 @@ Examples:
OptType: config.OptTypeInt, OptType: config.OptTypeInt,
ExternalOptType: "security level", ExternalOptType: "security level",
DefaultValue: status.SecurityLevelsAll, DefaultValue: status.SecurityLevelsAll,
ValidationRegex: "^(7|6|4)$", ValidationRegex: "^(4|6|7)$",
ExpertiseLevel: config.ExpertiseLevelExpert, ExpertiseLevel: config.ExpertiseLevelExpert,
}) })
if err != nil { if err != nil {
@@ -221,14 +221,14 @@ Examples:
// Include subdomains // Include subdomains
err = config.Register(&config.Option{ err = config.Register(&config.Option{
Name: "Filter SubDomains", Name: "Filter Subdomains",
Key: CfgOptionFilterSubDomainsKey, 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, Order: cfgOptionFilterSubDomainsOrder,
OptType: config.OptTypeInt, OptType: config.OptTypeInt,
ExternalOptType: "security level", ExternalOptType: "security level",
DefaultValue: status.SecurityLevelOff, DefaultValue: status.SecurityLevelsAll,
ValidationRegex: "^(0|4|6|7)$", ValidationRegex: "^(4|6|7)$",
}) })
if err != nil { if err != nil {
return err return err
@@ -351,7 +351,7 @@ Examples:
ReleaseLevel: config.ReleaseLevelBeta, ReleaseLevel: config.ReleaseLevelBeta,
ExternalOptType: "security level", ExternalOptType: "security level",
DefaultValue: status.SecurityLevelsAll, DefaultValue: status.SecurityLevelsAll,
ValidationRegex: "^(7|6|4)$", ValidationRegex: "^(4|6|7)$",
}) })
if err != nil { if err != nil {
return err return err
@@ -370,7 +370,7 @@ Examples:
ReleaseLevel: config.ReleaseLevelBeta, ReleaseLevel: config.ReleaseLevelBeta,
ExternalOptType: "security level", ExternalOptType: "security level",
DefaultValue: status.SecurityLevelsAll, DefaultValue: status.SecurityLevelsAll,
ValidationRegex: "^(7|6|4)$", ValidationRegex: "^(4|6|7)$",
}) })
if err != nil { if err != nil {
return err return err
@@ -388,7 +388,7 @@ Examples:
ReleaseLevel: config.ReleaseLevelBeta, ReleaseLevel: config.ReleaseLevelBeta,
ExternalOptType: "security level", ExternalOptType: "security level",
DefaultValue: status.SecurityLevelsAll, DefaultValue: status.SecurityLevelsAll,
ValidationRegex: "^(7|6|4)", ValidationRegex: "^(4|6|7)",
}) })
if err != nil { if err != nil {
return err return err