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

Revert "tinc: use ip from path"

Browse Source 
This reverts commit 332d4f5e17.
This commit is contained in:
tv 2022-03-06 10:51:05 +01:00
parent 560371d038
commit ccc7796402
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
krebs/3modules/tinc.nix
View File

@ -27,7 +27,7 @@ with import <stockholm/lib>;
${tinc.config.extraConfig} ${tinc.config.extraConfig}
''; '';
"tinc-up" = pkgs.writeDash "${netname}-tinc-up" '' "tinc-up" = pkgs.writeDash "${netname}-tinc-up" ''
ip link set ${netname} up ${tinc.config.iproutePackage}/sbin/ip link set ${netname} up
${tinc.config.tincUp} ${tinc.config.tincUp}
''; '';
}); });
@ -59,14 +59,15 @@ with import <stockholm/lib>;
type = types.str; type = types.str;
default = let default = let
net = tinc.config.host.nets.${netname}; net = tinc.config.host.nets.${netname};
iproute = tinc.config.iproutePackage;
in '' in ''
${optionalString (net.ip4 != null) /* sh */ '' ${optionalString (net.ip4 != null) /* sh */ ''
ip -4 addr add ${net.ip4.addr} dev ${netname} ${iproute}/sbin/ip -4 addr add ${net.ip4.addr} dev ${netname}
ip -4 route add ${net.ip4.prefix} dev ${netname} ${iproute}/sbin/ip -4 route add ${net.ip4.prefix} dev ${netname}
''} ''}
${optionalString (net.ip6 != null) /* sh */ '' ${optionalString (net.ip6 != null) /* sh */ ''
ip -6 addr add ${net.ip6.addr} dev ${netname} ${iproute}/sbin/ip -6 addr add ${net.ip6.addr} dev ${netname}
ip -6 route add ${net.ip6.prefix} dev ${netname} ${iproute}/sbin/ip -6 route add ${net.ip6.prefix} dev ${netname}
''} ''}
${tinc.config.tincUpExtra} ${tinc.config.tincUpExtra}
''; '';