summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-09-28 00:57:26 +0100
committerGitHub <noreply@github.com>2017-09-28 00:57:26 +0100
commit0a6fca15fd7bcafe2f98f05bd7a3ec816e2f3959 (patch)
treed11a16f2cf05a767456871356fc27d6aeae51977 /nixos
parent589311fee07baa540b83a8e54600cee97a6a5f1b (diff)
parentddd13e13756ac74a592b38569263a675cf72ba39 (diff)
downloadnixlib-0a6fca15fd7bcafe2f98f05bd7a3ec816e2f3959.tar
nixlib-0a6fca15fd7bcafe2f98f05bd7a3ec816e2f3959.tar.gz
nixlib-0a6fca15fd7bcafe2f98f05bd7a3ec816e2f3959.tar.bz2
nixlib-0a6fca15fd7bcafe2f98f05bd7a3ec816e2f3959.tar.lz
nixlib-0a6fca15fd7bcafe2f98f05bd7a3ec816e2f3959.tar.xz
nixlib-0a6fca15fd7bcafe2f98f05bd7a3ec816e2f3959.tar.zst
nixlib-0a6fca15fd7bcafe2f98f05bd7a3ec816e2f3959.zip
Merge pull request #29881 from volth/patch-67
nixos/tinc: add "restartTriggers" back
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/tinc.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 0354e76d74fb..adb80ea29840 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -163,6 +163,12 @@ 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)) ];
         serviceConfig = {
           Type = "simple";
           Restart = "always";