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

tinc: untangle tincUp and tincUpExtra

Browse Source
This commit is contained in:
tv 2023-01-23 18:24:47 +01:00
parent ef6ddd1de3
commit c8c916ccf1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
krebs/3modules/tinc.nix
View File

@ -26,9 +26,9 @@ with import <stockholm/lib>;
Port = ${toString tinc.config.host.nets.${netname}.tinc.port} Port = ${toString tinc.config.host.nets.${netname}.tinc.port}
${tinc.config.extraConfig} ${tinc.config.extraConfig}
''; '';
"tinc-up" = pkgs.writeDash "${netname}-tinc-up" '' "tinc-up" = pkgs.writeDash "${netname}-tinc-up" /* sh */ ''
${tinc.config.iproutePackage}/sbin/ip link set ${netname} up
${tinc.config.tincUp} ${tinc.config.tincUp}
${tinc.config.tincUpExtra}
''; '';
}); });
}; };
@ -60,7 +60,8 @@ with import <stockholm/lib>;
default = let default = let
net = tinc.config.host.nets.${netname}; net = tinc.config.host.nets.${netname};
iproute = tinc.config.iproutePackage; iproute = tinc.config.iproutePackage;
in '' in /* sh */ ''
${tinc.config.iproutePackage}/sbin/ip link set ${netname} up
${optionalString (net.ip4 != null) /* sh */ '' ${optionalString (net.ip4 != null) /* sh */ ''
${iproute}/sbin/ip -4 addr add ${net.ip4.addr} dev ${netname} ${iproute}/sbin/ip -4 addr add ${net.ip4.addr} dev ${netname}
${iproute}/sbin/ip -4 route add ${net.ip4.prefix} dev ${netname} ${iproute}/sbin/ip -4 route add ${net.ip4.prefix} dev ${netname}
@ -69,14 +70,13 @@ with import <stockholm/lib>;
${iproute}/sbin/ip -6 addr add ${net.ip6.addr} dev ${netname} ${iproute}/sbin/ip -6 addr add ${net.ip6.addr} dev ${netname}
${iproute}/sbin/ip -6 route add ${net.ip6.prefix} dev ${netname} ${iproute}/sbin/ip -6 route add ${net.ip6.prefix} dev ${netname}
''} ''}
${tinc.config.tincUpExtra}
''; '';
defaultText = '' defaultText = /* sh */ ''
ip -4 addr add ‹net.ip4.addr› dev ${netname} ip link set ‹netname› up
ip -4 route add ‹net.ip4.prefix› dev ${netname} ip -4 addr add ‹net.ip4.addr› dev ‹netname›
ip -6 addr add ‹net.ip6.addr› dev ${netname} ip -4 route add ‹net.ip4.prefix› dev ‹netname›
ip -6 route add ‹net.ip6.prefix› dev ${netname} ip -6 addr add ‹net.ip6.addr› dev ‹netname›
${tinc.config.tincUpExtra} ip -6 route add ‹net.ip6.prefix› dev ‹netname›
''; '';
description = '' description = ''
tinc-up script to be used. Defaults to setting the tinc-up script to be used. Defaults to setting the