summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorArseniy Seroka <jagajaga@users.noreply.github.com>2016-02-20 17:09:59 +0300
committerArseniy Seroka <jagajaga@users.noreply.github.com>2016-02-20 17:09:59 +0300
commitcbb06df02ff17662560a151b5cd4bd4c4e64d1fd (patch)
treeb94a4532e2ec659d78f09bbfc88e2404f56dc470 /nixos/modules/services
parent87d14d3e6982d5ff7172fe8fb3e2973195a56fd0 (diff)
parent99910d97c2e95e8e85a14d2aced3a7c3be9ca547 (diff)
downloadnixlib-cbb06df02ff17662560a151b5cd4bd4c4e64d1fd.tar
nixlib-cbb06df02ff17662560a151b5cd4bd4c4e64d1fd.tar.gz
nixlib-cbb06df02ff17662560a151b5cd4bd4c4e64d1fd.tar.bz2
nixlib-cbb06df02ff17662560a151b5cd4bd4c4e64d1fd.tar.lz
nixlib-cbb06df02ff17662560a151b5cd4bd4c4e64d1fd.tar.xz
nixlib-cbb06df02ff17662560a151b5cd4bd4c4e64d1fd.tar.zst
nixlib-cbb06df02ff17662560a151b5cd4bd4c4e64d1fd.zip
Merge pull request #13142 from zimbatm/zerotierone-1.1.4
Zerotierone 1.1.4
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/networking/zerotierone.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index 886ea18d9809..6237f95b127b 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -21,10 +21,9 @@ in
         chown -R root:root /var/lib/zerotier-one
         '';
       serviceConfig = {
-        Type = "forking";
-        User = "root";
-        PIDFile = "/var/lib/zerotier-one/zerotier-one.pid";
-        ExecStart = "${pkgs.zerotierone}/bin/zerotier-one -d";
+        ExecStart = "${pkgs.zerotierone}/bin/zerotier-one";
+        Restart = "always";
+        KillMode = "process";
       };
     };
   environment.systemPackages = [ pkgs.zerotierone ];