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

Merge pull request #11940 from jgillich/dnsmasq-leases

Browse Source 
dnsmasq: create state dir for dhcp leases file
This commit is contained in:
Domen Kožar 2015-12-30 16:50:14 +01:00
commit f41603d8a6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/networking/dnsmasq.nix
View File

@ -5,8 +5,10 @@ with lib;
let
cfg = config.services.dnsmasq;
dnsmasq = pkgs.dnsmasq;
stateDir = "/var/lib/dnsmasq";
dnsmasqConf = pkgs.writeText "dnsmasq.conf" ''
dhcp-leasefile=${stateDir}/dnsmasq.leases
${optionalString cfg.resolveLocalQueries ''
conf-file=/etc/dnsmasq-conf.conf
resolv-file=/etc/dnsmasq-resolv.conf
@ -76,12 +78,11 @@ in
services.dbus.packages = [ dnsmasq ];
users.extraUsers = singleton
{ name = "dnsmasq";
uid = config.ids.uids.dnsmasq;
description = "Dnsmasq daemon user";
home = "/var/empty";
};
users.extraUsers = singleton {
name = "dnsmasq";
uid = config.ids.uids.dnsmasq;
description = "Dnsmasq daemon user";
};
systemd.services.dnsmasq = {
description = "Dnsmasq Daemon";
@ -89,6 +90,9 @@ in
wantedBy = [ "multi-user.target" ];
path = [ dnsmasq ];
preStart = ''
mkdir -m 755 -p ${stateDir}
touch ${stateDir}/dnsmasq.leases
chown -R dnsmasq ${stateDir}
touch /etc/dnsmasq-{conf,resolv}.conf
dnsmasq --test
'';