diff options
| author | Joerg Thalheim <joerg@thalheim.io> | 2017-09-27 16:02:23 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-09-27 17:57:39 +0200 |
| commit | 75ba415fbcfe48fdf5fb88f2aa461ce83921303f (patch) | |
| tree | c6cf5d2efcb7f80abc50d21b93d987ea8c33302e /nixos | |
| parent | ad8cb0917fabff0cffe3f3b003343bc84d55d93e (diff) | |
| download | nixlib-75ba415fbcfe48fdf5fb88f2aa461ce83921303f.tar nixlib-75ba415fbcfe48fdf5fb88f2aa461ce83921303f.tar.gz nixlib-75ba415fbcfe48fdf5fb88f2aa461ce83921303f.tar.bz2 nixlib-75ba415fbcfe48fdf5fb88f2aa461ce83921303f.tar.lz nixlib-75ba415fbcfe48fdf5fb88f2aa461ce83921303f.tar.xz nixlib-75ba415fbcfe48fdf5fb88f2aa461ce83921303f.tar.zst nixlib-75ba415fbcfe48fdf5fb88f2aa461ce83921303f.zip | |
nixos/tinc: remove useless script argument
ExecStart is sufficient and more transparent to the user.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/tinc.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 4b80185a649f..0354e76d74fb 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -167,6 +167,7 @@ in Type = "simple"; Restart = "always"; RestartSec = "3"; + 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 = '' mkdir -p /etc/tinc/${network}/hosts @@ -186,9 +187,6 @@ in [ -f "/etc/tinc/${network}/rsa_key.priv" ] || tincd -n ${network} -K 4096 fi ''; - script = '' - tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel} - ''; }) ); |