cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #106715 from Mic92/tinc

Browse source
This commit is contained in:
Jörg Thalheim 2020-12-12 16:35:59 +00:00 committed by GitHub
commit 5f0d38f05b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/networking/tinc.nix
View file

@ -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 = ''

2
pkgs/tools/networking/tinc/pre.nix
View file

@ -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 ];
};
}