summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2020-12-12 16:35:59 +0000
committerGitHub <noreply@github.com>2020-12-12 16:35:59 +0000
commit5f0d38f05b44d7ae44af5ed6e7702724c40e341e (patch)
treebf67740a8d36261027ceaac79c8ae46f5faf33ab /nixos
parent5c15b688c0197f1053ff68b8cadebfcacea87d3c (diff)
parentf341fd2fe081402d1f4d18f4a11f9f383db921ab (diff)
downloadnixpkgs-5f0d38f05b44d7ae44af5ed6e7702724c40e341e.tar
nixpkgs-5f0d38f05b44d7ae44af5ed6e7702724c40e341e.tar.gz
nixpkgs-5f0d38f05b44d7ae44af5ed6e7702724c40e341e.tar.bz2
nixpkgs-5f0d38f05b44d7ae44af5ed6e7702724c40e341e.tar.lz
nixpkgs-5f0d38f05b44d7ae44af5ed6e7702724c40e341e.tar.xz
nixpkgs-5f0d38f05b44d7ae44af5ed6e7702724c40e341e.tar.zst
nixpkgs-5f0d38f05b44d7ae44af5ed6e7702724c40e341e.zip
Merge pull request #106715 from Mic92/tinc
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/tinc.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 725bd9bf940..b4b544a2413 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -168,6 +168,7 @@ in
           Type = "simple";
           Restart = "always";
           RestartSec = "3";
+          ExecReload = mkIf (versionAtLeast (getVersion data.package) "1.1pre") "${data.package}/bin/tinc -n ${network} reload";
           ExecStart = "${data.package}/bin/tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}";
         };
         preStart = ''