Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

krebs.tinc: don't bother aliasing packages

Browse Source
This commit is contained in:
tv 2021-12-23 03:12:02 +01:00
parent 5410c7dccc
commit 018018e16b
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
krebs/3modules/tinc.nix
View File

@ -237,15 +237,14 @@ let
} }
) config.krebs.tinc; ) config.krebs.tinc;
krebs.systemd.services = mapAttrs (netname: cfg: krebs.systemd.services = mapAttrs (netname: cfg: {
let
tinc = cfg.tincPackage;
iproute = cfg.iproutePackage;
in {
description = "Tinc daemon for ${netname}"; description = "Tinc daemon for ${netname}";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ tinc iproute ]; path = [
cfg.iproutePackage
cfg.tincPackage
];
reloadIfChanged = true; reloadIfChanged = true;
restartTriggers = [ cfg.confDir ]; restartTriggers = [ cfg.confDir ];
serviceConfig = { serviceConfig = {
@ -257,7 +256,7 @@ let
]; ];
Restart = "always"; Restart = "always";
ExecStart = toString [ ExecStart = toString [
"${tinc}/sbin/tincd" "${cfg.tincPackage}/sbin/tincd"
"-D" "-D"
"-U ${cfg.user.name}" "-U ${cfg.user.name}"
"-c /etc/tinc/${netname}" "-c /etc/tinc/${netname}"
@ -268,10 +267,9 @@ let
"-o PrivateKeyFile=\${CREDENTIALS_DIRECTORY}/rsa_key" "-o PrivateKeyFile=\${CREDENTIALS_DIRECTORY}/rsa_key"
"--pidfile=/var/run/tinc.${netname}.pid" "--pidfile=/var/run/tinc.${netname}.pid"
]; ];
ExecReload = "${tinc}/sbin/tinc -n ${netname} reload"; ExecReload = "${cfg.tincPackage}/sbin/tinc -n ${netname} reload";
SyslogIdentifier = netname; SyslogIdentifier = netname;
}; };
} }) config.krebs.tinc;
) config.krebs.tinc;
}; };
in out in out