diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-06-13 08:16:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-13 08:16:14 +0100 |
| commit | 69ffc8dc6a7724068b41a5d079e897c36083616d (patch) | |
| tree | 76a185128a498788c886959ce7af797c2cc643a8 | |
| parent | b346b0226d703699bd389ad742b1a4592eeb4c52 (diff) | |
| parent | 3ae018592de58f234f45f1da44dc5f40a2cd6833 (diff) | |
| download | nixlib-69ffc8dc6a7724068b41a5d079e897c36083616d.tar nixlib-69ffc8dc6a7724068b41a5d079e897c36083616d.tar.gz nixlib-69ffc8dc6a7724068b41a5d079e897c36083616d.tar.bz2 nixlib-69ffc8dc6a7724068b41a5d079e897c36083616d.tar.lz nixlib-69ffc8dc6a7724068b41a5d079e897c36083616d.tar.xz nixlib-69ffc8dc6a7724068b41a5d079e897c36083616d.tar.zst nixlib-69ffc8dc6a7724068b41a5d079e897c36083616d.zip | |
Merge pull request #41904 from volth/patch-156
nixos/tinc: minor fixes
| -rw-r--r-- | nixos/modules/services/networking/tinc.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index e3c9b5282b8c..77bcdae80191 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -163,12 +163,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ data.package ]; - restartTriggers = - let - drvlist = [ config.environment.etc."tinc/${network}/tinc.conf".source ] - ++ mapAttrsToList (host: _: config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts; - in # drvlist might be too long to be used directly - [ (builtins.hashString "sha256" (concatMapStrings (d: d.outPath) drvlist)) ]; + restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ]; serviceConfig = { Type = "simple"; Restart = "always"; @@ -207,7 +202,8 @@ in ${concatStringsSep "\n" (mapAttrsToList (network: data: optionalString (versionAtLeast data.package.version "1.1pre") '' makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" \ - --add-flags "--pidfile=/run/tinc.${network}.pid" + --add-flags "--pidfile=/run/tinc.${network}.pid" \ + --add-flags "--config=/etc/tinc/${network}" '') cfg.networks)} ''; }; |