Merge pull request #5080 from joachifm/dnscrypt-refactor

dnscrypt-proxy: minor superficial improvements
This commit is contained in:
Arseniy Seroka 2014-11-24 15:48:47 +03:00
commit fd5566da41
2 changed files with 10 additions and 8 deletions

View File

@ -6,13 +6,14 @@ let
dnscrypt-proxy = pkgs.dnscrypt-proxy; dnscrypt-proxy = pkgs.dnscrypt-proxy;
cfg = config.services.dnscrypt-proxy; cfg = config.services.dnscrypt-proxy;
uid = config.ids.uids.dnscrypt-proxy; uid = config.ids.uids.dnscrypt-proxy;
daemonArgs = [ "--daemonize" daemonArgs =
"--user=dnscrypt-proxy" [ "--daemonize"
"--local-address=${cfg.localAddress}:${toString cfg.port}" "--user=dnscrypt-proxy"
(optionalString cfg.tcpOnly "--tcp-only") "--local-address=${cfg.localAddress}:${toString cfg.port}"
"--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv" (optionalString cfg.tcpOnly "--tcp-only")
"--resolver-name=${cfg.resolverName}" "--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv"
]; "--resolver-name=${cfg.resolverName}"
];
in in
{ {

View File

@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ libsodium ]; buildInputs = [ libsodium ];
meta = { meta = {
description = "A DNS proxy which encrypts and authenticates requests using the DNSCrypt protocol."; description = "A tool for securing communications between a client and a DNS resolver";
homepage = http://dnscrypt.org/; homepage = http://dnscrypt.org/;
license = with stdenv.lib.licenses; [ isc ]; license = with stdenv.lib.licenses; [ isc ];
maintainers = with stdenv.lib.maintainers; [ joachifm ]; maintainers = with stdenv.lib.maintainers; [ joachifm ];
platform = stdenv.lib.platforms.all;
}; };
} }