1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00

nsd: Update from 4.1.0 -> 4.1.1

This commit is contained in:
Christoph Hrdinka 2015-03-18 21:01:35 +01:00
parent 2bc6af3efc
commit 6db8155e37
2 changed files with 18 additions and 2 deletions

View file

@ -107,6 +107,7 @@ let
zone:
name: "${name}"
zonefile: "${stateDir}/zones/${name}"
${maybeString "zonestats: " zone.zoneStats}
${maybeString "outgoing-interface: " zone.outgoingInterface}
${forEach " rrl-whitelist: " zone.rrlWhitelist}
@ -270,6 +271,19 @@ let
Use imports or pkgs.lib.readFile if you don't want this data in your config file.
'';
};
zoneStats = mkOption {
type = types.nullOr types.str;
default = null;
example = "%s";
description = ''
When config.nsd.zoneStats is set to true NSD is able of collecting
statistics per zone. All statistics of this zone(s) will be added
to the group specified by this given name. Use "%s" to use the zones
name as the group. The groups are output from nsd-control stats
and stats_noreset.
'';
};
};
};

View file

@ -8,14 +8,15 @@
, ratelimit ? false
, recvmmsg ? false
, rootServer ? false
, zoneStats ? false
}:
stdenv.mkDerivation rec {
name = "nsd-4.1.0";
name = "nsd-4.1.1";
src = fetchurl {
url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
sha256 = "ec3f6902f6f26a6b9248dcd7e9f42472fa52755740b4ba6b9d3bd08910b39b62";
sha256 = "b0c3fab40ac7a8b5ffca642bc9e1b424aa72aebd03adf13a1f24ab4874734640";
};
buildInputs = [ libevent openssl ];
@ -31,6 +32,7 @@ stdenv.mkDerivation rec {
++ edf ratelimit "ratelimit"
++ edf recvmmsg "recvmmsg"
++ edf rootServer "root-server"
++ edf zoneStats "zone-stats"
++ [ "--with-ssl=${openssl}" "--with-libevent=${libevent}" ];
meta = with stdenv.lib; {