Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d9a852e9ba3c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b0871bd97e6
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 24, 2021

  1. nixos/kresd: allow package to be configured

    @SuperSandro2000
    SuperSandro2000 committed Apr 24, 2021
    Copy the full SHA
    8ee00e6 View commit details

Commits on Apr 27, 2021

  1. nixos/kresd.package: improve the generated docs

    @vcunat
    vcunat committed Apr 27, 2021
    Copy the full SHA
    a4749b1 View commit details

Commits on Apr 29, 2021

  1. Merge #120493: nixos/kresd: allow package to be configured

    @vcunat
    vcunat committed Apr 29, 2021
    Copy the full SHA
    5b0871b View commit details
Showing with 12 additions and 5 deletions.
  1. +12 −5 nixos/modules/services/networking/kresd.nix
17 changes: 12 additions & 5 deletions nixos/modules/services/networking/kresd.nix
View file
Original file line number Diff line number Diff line change
@@ -29,8 +29,6 @@ let
+ concatMapStrings (mkListen "doh2") cfg.listenDoH
+ cfg.extraConfig
);

package = pkgs.knot-resolver;
in {
meta.maintainers = [ maintainers.vcunat /* upstream developer */ ];

@@ -58,6 +56,15 @@ in {
and give commands interactively to kresd@1.service.
'';
};
package = mkOption {
type = types.package;
description = "
knot-resolver package to use.
";
default = pkgs.knot-resolver;
defaultText = "pkgs.knot-resolver";
example = literalExample "pkgs.knot-resolver.override { extraFeatures = true; }";
};
extraConfig = mkOption {
type = types.lines;
default = "";
@@ -115,16 +122,16 @@ in {
};
users.groups.knot-resolver.gid = null;

systemd.packages = [ package ]; # the units are patched inside the package a bit
systemd.packages = [ cfg.package ]; # the units are patched inside the package a bit

systemd.targets.kresd = { # configure units started by default
wantedBy = [ "multi-user.target" ];
wants = [ "kres-cache-gc.service" ]
++ map (i: "kresd@${toString i}.service") (range 1 cfg.instances);
};
systemd.services."kresd@".serviceConfig = {
ExecStart = "${package}/bin/kresd --noninteractive "
+ "-c ${package}/lib/knot-resolver/distro-preconfig.lua -c ${configFile}";
ExecStart = "${cfg.package}/bin/kresd --noninteractive "
+ "-c ${cfg.package}/lib/knot-resolver/distro-preconfig.lua -c ${configFile}";
# Ensure /run/knot-resolver exists
RuntimeDirectory = "knot-resolver";
RuntimeDirectoryMode = "0770";