diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-09 17:11:36 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-09 17:11:36 +0100 |
| commit | f312e6d9930e9cd278f5823f6040f6e8e1214ab6 (patch) | |
| tree | abc27b49b2a0ed421d61f9def3b6d2f11e3921c3 /nixos/modules/services/networking | |
| parent | f19d959ef1cfe9c4064f7e54d9aca7f3457767f4 (diff) | |
| download | nixlib-f312e6d9930e9cd278f5823f6040f6e8e1214ab6.tar nixlib-f312e6d9930e9cd278f5823f6040f6e8e1214ab6.tar.gz nixlib-f312e6d9930e9cd278f5823f6040f6e8e1214ab6.tar.bz2 nixlib-f312e6d9930e9cd278f5823f6040f6e8e1214ab6.tar.lz nixlib-f312e6d9930e9cd278f5823f6040f6e8e1214ab6.tar.xz nixlib-f312e6d9930e9cd278f5823f6040f6e8e1214ab6.tar.zst nixlib-f312e6d9930e9cd278f5823f6040f6e8e1214ab6.zip | |
nixos/kresd: use systemd.tmpfiles
Since 4e4161c21268d6 it works on nixos-rebuild.
Diffstat (limited to 'nixos/modules/services/networking')
| -rw-r--r-- | nixos/modules/services/networking/kresd.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index b0b3a8480d1f..64f36cadc1d0 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -86,16 +86,7 @@ in }; }; - # Create the cacheDir; tmpfiles don't work on nixos-rebuild switch. - systemd.services.kresd-cachedir = { - serviceConfig.Type = "oneshot"; - script = '' - if [ ! -d '${cfg.cacheDir}' ]; then - mkdir -p '${cfg.cacheDir}' - chown kresd:kresd '${cfg.cacheDir}' - fi - ''; - }; + systemd.tmpfiles.rules = [ "d '${cfg.cacheDir}' 0770 kresd kresd - -" ]; systemd.services.kresd = { description = "Knot-resolver daemon"; @@ -111,8 +102,7 @@ in -k '${cfg.cacheDir}/root.key' ''; - after = [ "kresd-cachedir.service" ]; - requires = [ "kresd.socket" "kresd-cachedir.service" ]; + requires = [ "kresd.socket" ]; }; }; } |