summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/tinc.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2022-02-01 13:54:09 +0100
committermakefu <github@syntax-fehler.de>2022-02-01 13:54:09 +0100
commitc564c4f0f48e6d6e889f50b520b7c512df527660 (patch)
tree540a8ed795596c2de673f1fb4326dd89a003c1a4 /krebs/3modules/tinc.nix
parent965a6c96c3b7216bf8ca1b985f8bece6c73213c4 (diff)
parentbe042e3446905e2517b530403bacc63b6de49d34 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules/tinc.nix')
-rw-r--r--krebs/3modules/tinc.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix
index 21ddde1c6..31371af59 100644
--- a/krebs/3modules/tinc.nix
+++ b/krebs/3modules/tinc.nix
@@ -48,7 +48,7 @@ with import <stockholm/lib>;
};
extraConfig = mkOption {
- type = types.str;
+ type = types.lines;
default = "";
description = ''
Extra Configuration to be appended to tinc.conf
@@ -233,6 +233,7 @@ with import <stockholm/lib>;
cfg.iproutePackage
cfg.tincPackage
];
+ reloadIfChanged = true;
serviceConfig = {
Restart = "always";
LoadCredential = filter (x: x != "") [
@@ -260,7 +261,7 @@ with import <stockholm/lib>;
"-o PrivateKeyFile=\${CREDENTIALS_DIRECTORY}/rsa_key"
"--pidfile=/var/run/tinc.${netname}.pid"
];
- ExecReload = "${cfg.tincPackage}/sbin/tinc -n ${netname} reload";
+ ExecReload = "${cfg.tincPackage}/sbin/tinc -n ${netname} restart";
SyslogIdentifier = netname;
};
}) config.krebs.tinc;