Merge: - config: global "blocked_services" settings were reset on startup

* commit 'b1ca7c90d3ef0e72d3535b7cf195adfe83d34e5a': - config: global "blocked_services" settings were reset on startup
2019-08-22 15:38:24 +03:00 · 2019-08-22 15:38:24 +03:00 · 64d40bdc47
parent bde59364c6 b1ca7c90d3
commit 64d40bdc47
1 changed files with 1 additions and 1 deletions
--- a/dnsforward/dnsforward.go
+++ b/dnsforward/dnsforward.go
@ -98,7 +98,7 @@ type FilteringConfig struct {

 	// Names of services to block (globally).
 	// Per-client settings can override this configuration.
-	BlockedServices []string `json:"blocked_services"`
+	BlockedServices []string `yaml:"blocked_services"`

 	dnsfilter.Config `yaml:",inline"`
 }