mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-28 02:37:09 +00:00
Code Activity

Merge pull request #281 from hauleth/fix/dnsmasq-resolver-file

Browse source 
Use separate config option to set port of DNSmasq
This commit is contained in:
Daiderd Jordan 2021-01-28 20:35:47 +01:00 • committed by GitHub
commit 9e3e4033bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/services/dnsmasq.nix
View file

@ -63,7 +63,10 @@ in
name = "resolver/${domain}";
value = {
enable = true;
text = "nameserver ${cfg.bind}.${toString cfg.port}";
text = ''
port ${toString cfg.port}
nameserver ${cfg.bind}
'';
};
}) (builtins.attrNames cfg.addresses));
};

3
tests/services-dnsmasq.nix
View file

@ -20,6 +20,7 @@ in
grep -F -- "--address=/localhost/127.0.0.1" ${config.out}/Library/LaunchDaemons/org.nixos.dnsmasq.plist
echo >&2 "checking resolver config"
grep -F "nameserver 127.0.0.1.53" ${config.out}/etc/resolver/localhost
grep -F "port 53" ${config.out}/etc/resolver/localhost
grep -F "nameserver 127.0.0.1" ${config.out}/etc/resolver/localhost
'';
}