From 2cdec00dd200991b2f4c517695896d6159fe3bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 29 Nov 2020 13:46:28 +0100 Subject: [PATCH 1/2] nixos/tinc: add reload command --- nixos/modules/services/networking/tinc.nix | 1 + 1 file changed, 1 insertion(+) 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 = '' From f341fd2fe081402d1f4d18f4a11f9f383db921ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 12 Dec 2020 07:38:39 +0100 Subject: [PATCH 2/2] tinc: add myself as maintainer --- pkgs/tools/networking/tinc/pre.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 85cdd19702f..a49ab43e55e 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { homepage="http://www.tinc-vpn.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz lassulus ]; + maintainers = with maintainers; [ fpletz lassulus mic92 ]; }; }