From 78b06757c29a0b662e9463a9b4a29162fae8ef65 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 17 Mar 2018 20:30:44 -0400 Subject: [PATCH 1/2] powerdns: adding disassembler as maintainer --- pkgs/servers/dns/powerdns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index cde2fe1a426c..4884cebc8158 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # cannot find postgresql libs on macos x license = licenses.gpl2; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 disassembler ]; }; } From f515ca67f5b363c2da4ac9fe2cdd9e4079203e70 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 17 Mar 2018 19:05:27 -0400 Subject: [PATCH 2/2] nixos/dnsdist: initial service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/dnsdist.nix | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 nixos/modules/services/networking/dnsdist.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 505c5497d36d..4110fb6443ae 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -467,6 +467,7 @@ ./services/networking/dnschain.nix ./services/networking/dnscrypt-proxy.nix ./services/networking/dnscrypt-wrapper.nix + ./services/networking/dnsdist.nix ./services/networking/dnsmasq.nix ./services/networking/ejabberd.nix ./services/networking/fakeroute.nix diff --git a/nixos/modules/services/networking/dnsdist.nix b/nixos/modules/services/networking/dnsdist.nix new file mode 100644 index 000000000000..12eee136e639 --- /dev/null +++ b/nixos/modules/services/networking/dnsdist.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.dnsdist; + configFile = pkgs.writeText "dndist.conf" '' + setLocal('${cfg.listenAddress}:${toString cfg.listenPort}') + ${cfg.extraConfig} + ''; +in { + options = { + services.dnsdist = { + enable = mkEnableOption "dnsdist domain name server"; + + listenAddress = mkOption { + type = types.str; + description = "Listen IP Address"; + default = "0.0.0.0"; + }; + listenPort = mkOption { + type = types.int; + description = "Listen port"; + default = 53; + }; + + extraConfig = mkOption { + type = types.lines; + default = '' + ''; + description = '' + Extra lines to be added verbatim to dnsdist.conf. + ''; + }; + }; + }; + + config = mkIf config.services.dnsdist.enable { + systemd.services.dnsdist = { + description = "dnsdist load balancer"; + wantedBy = [ "multi-user.target" ]; + after = ["network.target"]; + + serviceConfig = { + Restart="on-failure"; + RestartSec="1"; + DynamicUser = true; + StartLimitInterval="0"; + PrivateTmp=true; + PrivateDevices=true; + CapabilityBoundingSet="CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID"; + ExecStart = "${pkgs.dnsdist}/bin/dnsdist --supervised --disable-syslog --config ${configFile}"; + ProtectSystem="full"; + ProtectHome=true; + RestrictAddressFamilies="AF_UNIX AF_INET AF_INET6"; + LimitNOFILE="16384"; + TasksMax="8192"; + }; + }; + }; +}