about summary refs log tree commit diff
path: root/nixos/modules/services/networking/dnsmasq.nix
AgeCommit message (Collapse)AuthorFilesLines
2017-10-12dnsmasq nixos: make sure it always runsPeter Hoeg1-2/+12
By default we only restart if the dnsmasq daemon fails but we introduce an option to always keep it running.
2017-09-23Revert "nixos: add option for bind to not resolve local queries (#29503)"Peter Simons1-1/+1
This reverts commit 670b4e29adc16e0a29aa5b4c126703dcca56aeb6. The change added in this commit was controversial when it was originally suggested in https://github.com/NixOS/nixpkgs/pull/29205. Then that PR was closed and a new one opened, https://github.com/NixOS/nixpkgs/pull/29503, effectively circumventing the review process. I don't agree with this modification. Adding an option 'resolveLocalQueries' to tell the locally running name server that it should resolve local DNS queries feels outright nuts. I agree that the current state is unsatisfactory and that it should be improved, but this is not the right way. (cherry picked from commit 23a021d12e8f939cd0bfddb1c7adeb125028c1e3)
2017-09-18nixos: add option for bind to not resolve local queries (#29503)gwitmond1-1/+1
When the user specifies the networking.nameservers setting in the configuration file, it must take precedence over automatically derived settings. The culprit was services.bind that made the resolver set to 127.0.0.1 and ignore the nameserver setting. This patch adds a flag to services.bind to override the nameserver to localhost. It defaults to true. Setting this to false prevents the service.bind and dnsmasq.resolveLocalQueries settings from overriding the users' settings. Also, when the user specifies a domain to search, it must be set in the resolver configuration, even if the user does not specify any nameservers. (cherry picked from commit 670b4e29adc16e0a29aa5b4c126703dcca56aeb6) This commit was accidentally merged to 17.09 but was intended for master. This is the cherry-pick to master.
2015-12-24dnsmasq: create state dir for dhcp leases fileJakob Gillich1-6/+10
ref #11718
2015-09-08dnsmasq nixos module: fix path in systemd serviceThomas Strobel1-1/+1
2015-08-05dnsmasq restarts if /etc/hosts file is changed by nixos-rebuildAnders Papitto1-0/+1
2015-06-15Some more type cleanupEelco Dolstra1-1/+1
2015-04-16dnsmasq: Add some typesEelco Dolstra1-4/+7
2015-02-25nixos/dnsmasq: Fix service name typoWilliam A. Kennington III1-1/+1
2014-11-26systemd: Enable more network servicesWilliam A. Kennington III1-1/+1
2014-09-03Fixing comment caseMichael Raskin1-1/+1
2014-09-02nixos/dnsmasq: Fix regressions during the systemd updateWilliam A. Kennington III1-7/+12
2014-08-28dnsmasq: upgrade to 2.71, fixed dnsmasq modulePaul Colomiets1-9/+36
* The module now has systemd config * Add resolveLocalQueries option which sets up it as a dns server for local host (including reasonable setup of resolvconf) * Add "dnsmasq" user for running daemon * Enabled dbus and dnssec support for the package Conflicts: nixos/modules/misc/ids.nix
2014-04-14Rewrite ‘with pkgs.lib’ -> ‘with lib’Eelco Dolstra1-2/+2
Using pkgs.lib on the spine of module evaluation is problematic because the pkgs argument depends on the result of module evaluation. To prevent an infinite recursion, pkgs and some of the modules are evaluated twice, which is inefficient. Using ‘with lib’ prevents this problem.
2013-10-10Move all of NixOS to nixos/ in preparation of the repository mergeEelco Dolstra1-0/+70