Skip to content

Commit

Permalink
Merge: - config: global "blocked_services" settings were reset on sta…
Browse files Browse the repository at this point in the history
…rtup

* commit 'b1ca7c90d3ef0e72d3535b7cf195adfe83d34e5a':
  - config: global "blocked_services" settings were reset on startup
  • Loading branch information
ameshkov committed Aug 22, 2019
2 parents bde5936 + b1ca7c9 commit 64d40bd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion dnsforward/dnsforward.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
Expand Down

0 comments on commit 64d40bd

Please sign in to comment.