summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-08-16 18:44:27 +0200
committerGitHub <noreply@github.com>2020-08-16 18:44:27 +0200
commitbda86eee87658f25cc918adb4c821e482ff24249 (patch)
tree39e3d84fd3f106ee28209a2503d9d95f150c0a20
parentMerge pull request #95095 from Ma27/bump-neomutt (diff)
parentnixos/kresd: ensure /run/knot-resolver exists (diff)
downloadnixpkgs-bda86eee87658f25cc918adb4c821e482ff24249.tar.gz
Merge pull request #95222 from eadwu/kresd/runtime-fixes
kresd: runtime fixes
-rw-r--r--nixos/modules/services/networking/kresd.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index 26ddd4e811ed..ccb34163d5f3 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -129,13 +129,17 @@ in {
systemd.services."kresd@".serviceConfig = {
ExecStart = "${package}/bin/kresd --noninteractive "
+ "-c ${package}/lib/knot-resolver/distro-preconfig.lua -c ${configFile}";
- # Ensure correct ownership in case UID or GID changes.
+ # Ensure /run/knot-resolver exists
+ RuntimeDirectory = "knot-resolver";
+ RuntimeDirectoryMode = "0770";
+ # Ensure /var/lib/knot-resolver exists
+ StateDirectory = "knot-resolver";
+ StateDirectoryMode = "0770";
+ # Ensure /var/cache/knot-resolver exists
CacheDirectory = "knot-resolver";
- CacheDirectoryMode = "0750";
+ CacheDirectoryMode = "0770";
};
- systemd.tmpfiles.packages = [ package ];
-
# Try cleaning up the previously default location of cache file.
# Note that /var/cache/* should always be safe to remove.
# TODO: remove later, probably between 20.09 and 21.03