Merge pull request #91514 from NinjaTrappeur/nin-fix-nsdconf

nixos/nsd: symlink conf file to /etc/nsd

Changed files
+10 -5
nixos
modules
services
networking
pkgs
servers
dns
+4 -3
nixos/modules/services/networking/nsd.nix
···
# 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;
···
+ "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;
+6 -2
pkgs/servers/dns/nsd/default.nix
···
-
{ stdenv, fetchurl, libevent, openssl
+
{ stdenv, fetchurl, libevent, openssl, nixosTests
, bind8Stats ? false
, checking ? false
, ipv6 ? true
···
, rrtypes ? false
, zoneStats ? false
-
, configFile ? "etc/nsd/nsd.conf"
+
, configFile ? "/etc/nsd/nsd.conf"
}:
stdenv.mkDerivation rec {
···
patchPhase = ''
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";