Merge master into staging-next

2021-04-18 18:10:37 +00:00
parent 9e804db1da 528b3af306
commit b57b2b362c
31 changed files with 2856 additions and 410 deletions
@@ -4,7 +4,7 @@ with lib;

 let
  cfg = config.services.dnsdist;
-  configFile = pkgs.writeText "dndist.conf" ''
+  configFile = pkgs.writeText "dnsdist.conf" ''
    setLocal('${cfg.listenAddress}:${toString cfg.listenPort}')
    ${cfg.extraConfig}
  '';