diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-08-13 09:43:58 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-08-13 09:43:58 +0200 |
| commit | d1e4c8fee500324ea69415924382843f33a8166a (patch) | |
| tree | 4eeb2aab3c91d04a27f1e269529270a7d49819bb | |
| parent | 06f9bbbc78e0c9320037c5fb9d6bf740e3b81ee3 (diff) | |
| download | nixos-d1e4c8fee500324ea69415924382843f33a8166a.tar nixos-d1e4c8fee500324ea69415924382843f33a8166a.tar.gz nixos-d1e4c8fee500324ea69415924382843f33a8166a.tar.bz2 nixos-d1e4c8fee500324ea69415924382843f33a8166a.tar.xz nixos-d1e4c8fee500324ea69415924382843f33a8166a.zip | |
...
| -rw-r--r-- | custom/tinc/def.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix index 7e7e83b2..bbf9f483 100644 --- a/custom/tinc/def.nix +++ b/custom/tinc/def.nix | |||
| @@ -151,7 +151,7 @@ in | |||
| 151 | 151 | ||
| 152 | case "''${2}" in | 152 | case "''${2}" in |
| 153 | (?(vpn-)up) | 153 | (?(vpn-)up) |
| 154 | ${data.package}/bin/tinc -n ${network} --pidfile /run/tinc.${network}.pid retry | 154 | ${data.package}/bin/tinc -n ${network} --pidfile /run/tinc.${network}.pid --batch retry |
| 155 | ;; | 155 | ;; |
| 156 | esac | 156 | esac |
| 157 | ''; | 157 | ''; |
| @@ -168,6 +168,9 @@ in | |||
| 168 | serviceConfig = { | 168 | serviceConfig = { |
| 169 | Type = "simple"; | 169 | Type = "simple"; |
| 170 | PIDFile = "/run/tinc.${network}.pid"; | 170 | PIDFile = "/run/tinc.${network}.pid"; |
| 171 | ExecStartPre = '' | ||
| 172 | ${data.package}/bin/tinc -n ${network} --pidfile /run/tinc.${network}.pid --batch fsck | ||
| 173 | ''; | ||
| 171 | ExecStart = '' | 174 | ExecStart = '' |
| 172 | ${data.package}/bin/tincd -D -U tinc.${network} -n ${network} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel} | 175 | ${data.package}/bin/tincd -D -U tinc.${network} -n ${network} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel} |
| 173 | ''; | 176 | ''; |
