movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #12487 from hrdinka/refactor/nsd

Browse source 
Refactor NSD service and update to 4.1.7
This commit is contained in:
Franz Pletz 2016-02-28 17:13:21 +01:00
commit a9d24cedeb
3 changed files with 549 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

21
nixos/doc/manual/release-notes/rl-unstable.xml
View file

@ -226,6 +226,27 @@ programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];
was removed. Please review the currently available options.</para> was removed. Please review the currently available options.</para>
</listitem> </listitem>
<listitem>
<para>
The option <option>services.nsd.zones.&lt;name&gt;.data</option> no
longer interpret the dollar sign ($) as a shell variable, as such it
should not be escaped anymore. Thus the following zone data:
</para>
<programlisting>
\$ORIGIN example.com.
\$TTL 1800
@ IN SOA ns1.vpn.nbp.name. admin.example.com. (
</programlisting>
<para>
Should modified to look like the actual file expected by nsd:
</para>
<programlisting>
$ORIGIN example.com.
$TTL 1800
@ IN SOA ns1.vpn.nbp.name. admin.example.com. (
</programlisting>
</listitem>
</itemizedlist> </itemizedlist>

975
nixos/modules/services/networking/nsd.nix
View file

File diff suppressed because it is too large Load diff

5
pkgs/servers/dns/nsd/default.nix
View file

@ -13,11 +13,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nsd-4.1.6"; name = "nsd-4.1.7";
src = fetchurl { src = fetchurl {
url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
sha256 = "0pvpsxhil60m21h3pqlzs0l5m8qd3l6j8fkjyfg8plwmbh2j5xl8"; sha256 = "12hskfgfbkvcgpa1xxkqd8lnc6xvln1amn97x6avfnj9kfrbxa3v";
}; };
buildInputs = [ libevent openssl ]; buildInputs = [ libevent openssl ];
@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
homepage = http://www.nlnetlabs.nl; homepage = http://www.nlnetlabs.nl;
description = "Authoritative only, high performance, simple and open source name server"; description = "Authoritative only, high performance, simple and open source name server";
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.hrdinka ]; maintainers = [ maintainers.hrdinka ];
}; };