public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/dnscrypt-proxy: remove the resolverList option 

This option was initially added to make it easier to use an
up-to-date list, but now that we always use an up-to-date list
from upstream, there's no point to the option.

From now on, you can either use a resolver listed by dnscrypt
upstream or a custom resolver.
This commit is contained in:
Joachim Fasting 2017-03-10 14:20:30 +01:00
parent 540740598e
commit 472002f216
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nixos/modules/services/networking/dnscrypt-proxy.nix
View File

@ -15,16 +15,13 @@ let
}; };
# Internal flag indicating whether the upstream resolver list is used. # Internal flag indicating whether the upstream resolver list is used.
useUpstreamResolverList = cfg.resolverList == null && cfg.customResolver == null; useUpstreamResolverList = cfg.customResolver == null;
# The final local address. # The final local address.
localAddress = "${cfg.localAddress}:${toString cfg.localPort}"; localAddress = "${cfg.localAddress}:${toString cfg.localPort}";
# The final resolvers list path. # The final resolvers list path.
resolverList = resolverList = "${stateDirectory}/dnscrypt-resolvers.csv";
if (cfg.resolverList != null)
then cfg.resolverList
else "${stateDirectory}/dnscrypt-resolvers.csv";
# Build daemon command line # Build daemon command line
@ -88,19 +85,11 @@ in
default = "dnscrypt.eu-nl"; default = "dnscrypt.eu-nl";
type = types.nullOr types.str; type = types.nullOr types.str;
description = '' description = ''
The name of the upstream DNSCrypt resolver to use, taken from The name of the DNSCrypt resolver to use, taken from
<filename>${resolverList}</filename>. The default resolver is <filename>${resolverList}</filename>. The default
located in Holland, supports DNS security extensions, and resolver is located in Holland, supports DNS security
<emphasis>claims</emphasis> to not keep logs. extensions, and <emphasis>claims</emphasis> to not
''; keep logs.
};
resolverList = mkOption {
default = null;
type = types.nullOr types.path;
description = ''
List of DNSCrypt resolvers. The default is to use the list of
public resolvers provided by upstream.
''; '';
}; };
@ -319,5 +308,10 @@ in
(config: (config:
let val = getAttrFromPath [ "services" "dnscrypt-proxy" "ephemeralKeys" ] config; in let val = getAttrFromPath [ "services" "dnscrypt-proxy" "ephemeralKeys" ] config; in
optional val "-E")) optional val "-E"))
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" "resolverList" ] ''
The current resolver listing from upstream is always used
unless a custom resolver is specified.
'')
]; ];
} }