Merge pull request #13142 from zimbatm/zerotierone-1.1.4

Zerotierone 1.1.4
This commit is contained in:
Arseniy Seroka 2016-02-20 17:09:59 +03:00
commit cbb06df02f
2 changed files with 5 additions and 6 deletions

View File

@ -21,10 +21,9 @@ in
chown -R root:root /var/lib/zerotier-one chown -R root:root /var/lib/zerotier-one
''; '';
serviceConfig = { serviceConfig = {
Type = "forking"; ExecStart = "${pkgs.zerotierone}/bin/zerotier-one";
User = "root"; Restart = "always";
PIDFile = "/var/lib/zerotier-one/zerotier-one.pid"; KillMode = "process";
ExecStart = "${pkgs.zerotierone}/bin/zerotier-one -d";
}; };
}; };
environment.systemPackages = [ pkgs.zerotierone ]; environment.systemPackages = [ pkgs.zerotierone ];

View File

@ -3,12 +3,12 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.0"; version = "1.1.4";
name = "zerotierone"; name = "zerotierone";
src = fetchurl { src = fetchurl {
url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
sha256 = "2d7ff178bd7fd284ebb7011d8a91bde51befda60f100eb5429a2dcb6626cf676"; sha256 = "10aw0dlkmprdvph3aqkqximxqkryf0l4jcnv2bbm7f1qvclqihva";
}; };
preConfigure = '' preConfigure = ''