alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/avahi: move nss database configuration into avahi module

Browse source
This commit is contained in:
Florian Klink 2020-05-06 00:17:05 +02:00
parent 4f9c8ef791
commit fd21793de6
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/config/nsswitch.nix
View file

@ -9,15 +9,12 @@ let
# only with nscd up and running we can load NSS modules that are not integrated in NSS # only with nscd up and running we can load NSS modules that are not integrated in NSS
canLoadExternalModules = config.services.nscd.enable; canLoadExternalModules = config.services.nscd.enable;
# XXX Move these to their respective modules # XXX Move these to their respective modules
nssmdns = canLoadExternalModules && config.services.avahi.nssmdns;
nsswins = canLoadExternalModules && config.services.samba.nsswins; nsswins = canLoadExternalModules && config.services.samba.nsswins;
hostArray = mkMerge [ hostArray = mkMerge [
(mkBefore [ "files" ]) (mkBefore [ "files" ])
(mkIf nssmdns [ "mdns_minimal [NOTFOUND=return]" ])
(mkIf nsswins [ "wins" ]) (mkIf nsswins [ "wins" ])
(mkAfter [ "dns" ]) (mkAfter [ "dns" ])
(mkIf nssmdns (mkOrder 1501 [ "mdns" ])) # 1501 to ensure it's after dns
]; ];
in { in {

4
nixos/modules/services/networking/avahi-daemon.nix
View file

@ -238,6 +238,10 @@ in
users.groups.avahi = {}; users.groups.avahi = {};
system.nssModules = optional cfg.nssmdns pkgs.nssmdns; system.nssModules = optional cfg.nssmdns pkgs.nssmdns;
system.nssDatabases.hosts = optionals cfg.nssmdns (mkMerge [
[ "mdns_minimal [NOTFOUND=return]" ]
(mkOrder 1501 [ "mdns" ]) # 1501 to ensure it's after dns
]);
environment.systemPackages = [ pkgs.avahi ]; environment.systemPackages = [ pkgs.avahi ];