diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 6e3eed0c557..3ecbd06ee41 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -11,8 +11,6 @@ let # build nsd with the options needed for the given config nsdPkg = pkgs.nsd.override { - configFile = "${configFile}/nsd.conf"; - bind8Stats = cfg.bind8Stats; ipv6 = cfg.ipv6; ratelimit = cfg.ratelimit.enable; @@ -897,7 +895,10 @@ in + "want, please enable 'services.nsd.rootServer'."; }; - environment.systemPackages = [ nsdPkg ]; + environment = { + systemPackages = [ nsdPkg ]; + etc."nsd/nsd.conf".source = "${configFile}/nsd.conf"; + }; users.groups.${username}.gid = config.ids.gids.nsd; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 43c2900443e..8d4125b8fa1 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libevent, openssl +{ stdenv, fetchurl, libevent, openssl, nixosTests , bind8Stats ? false , checking ? false , ipv6 ? true @@ -11,7 +11,7 @@ , rrtypes ? false , zoneStats ? false -, configFile ? "etc/nsd/nsd.conf" +, configFile ? "/etc/nsd/nsd.conf" }: stdenv.mkDerivation rec { @@ -52,6 +52,10 @@ stdenv.mkDerivation rec { sed 's@$(INSTALL_DATA) nsd.conf.sample $(DESTDIR)$(nsdconfigfile).sample@@g' -i Makefile.in ''; + passthru.tests = { + inherit (nixosTests) nsd; + }; + meta = with stdenv.lib; { homepage = "http://www.nlnetlabs.nl"; description = "Authoritative only, high performance, simple and open source name server";