public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/samba: move nss database configuration into samba module

Browse Source
This commit is contained in:
Florian Klink 2020-05-06 00:20:30 +02:00
parent fd21793de6
commit 1fb6c37597
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/modules/config/nsswitch.nix
View File

@ -4,20 +4,7 @@
with lib; with lib;
let {
# only with nscd up and running we can load NSS modules that are not integrated in NSS
canLoadExternalModules = config.services.nscd.enable;
# XXX Move these to their respective modules
nsswins = canLoadExternalModules && config.services.samba.nsswins;
hostArray = mkMerge [
(mkBefore [ "files" ])
(mkIf nsswins [ "wins" ])
(mkAfter [ "dns" ])
];
in {
options = { options = {
# NSS modules. Hacky! # NSS modules. Hacky!
@ -109,7 +96,7 @@ in {
assertions = [ assertions = [
{ {
# generic catch if the NixOS module adding to nssModules does not prevent it with specific message. # generic catch if the NixOS module adding to nssModules does not prevent it with specific message.
assertion = config.system.nssModules.path != "" -> canLoadExternalModules; assertion = config.system.nssModules.path != "" -> config.services.nscd.enable;
message = "Loading NSS modules from path ${config.system.nssModules.path} requires nscd being enabled."; message = "Loading NSS modules from path ${config.system.nssModules.path} requires nscd being enabled.";
} }
]; ];
@ -134,7 +121,10 @@ in {
passwd = mkBefore [ "files" ]; passwd = mkBefore [ "files" ];
group = mkBefore [ "files" ]; group = mkBefore [ "files" ];
shadow = mkBefore [ "files" ]; shadow = mkBefore [ "files" ];
hosts = hostArray; hosts = mkMerge [
(mkBefore [ "files" ])
(mkAfter [ "dns" ])
];
services = mkBefore [ "files" ]; services = mkBefore [ "files" ];
}; };
}; };

1
nixos/modules/services/network-filesystems/samba.nix
View File

@ -224,6 +224,7 @@ in
(mkIf cfg.enable { (mkIf cfg.enable {
system.nssModules = optional cfg.nsswins samba; system.nssModules = optional cfg.nsswins samba;
system.nssDatabases.hosts = optional cfg.nsswins "wins";
systemd = { systemd = {
targets.samba = { targets.samba = {