diff options
| author | makefu <github@syntax-fehler.de> | 2022-02-14 19:48:45 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2022-02-14 19:48:45 +0100 |
| commit | a677e709924001ff1b1b591b6011184fb90addd9 (patch) | |
| tree | 7aa00fc6012deef486b5e4c154fb51cd6c8e368d /krebs/3modules/tinc.nix | |
| parent | bf3c158391b982ed660fd968d4bb2a19590bf5bd (diff) | |
| parent | 29dbbbb453bd4fabd91a21f9c3a1f37521b2aec8 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules/tinc.nix')
| -rw-r--r-- | krebs/3modules/tinc.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix index 31371af59..bc85aa0a6 100644 --- a/krebs/3modules/tinc.nix +++ b/krebs/3modules/tinc.nix @@ -26,7 +26,7 @@ with import <stockholm/lib>; ${tinc.config.extraConfig} ''; "tinc-up" = pkgs.writeDash "${netname}-tinc-up" '' - ${tinc.config.iproutePackage}/sbin/ip link set ${netname} up + ip link set ${netname} up ${tinc.config.tincUp} ''; }); @@ -58,15 +58,14 @@ with import <stockholm/lib>; type = types.str; default = let net = tinc.config.host.nets.${netname}; - iproute = tinc.config.iproutePackage; in '' ${optionalString (net.ip4 != null) /* sh */ '' - ${iproute}/sbin/ip -4 addr add ${net.ip4.addr} dev ${netname} - ${iproute}/sbin/ip -4 route add ${net.ip4.prefix} dev ${netname} + ip -4 addr add ${net.ip4.addr} dev ${netname} + ip -4 route add ${net.ip4.prefix} dev ${netname} ''} ${optionalString (net.ip6 != null) /* sh */ '' - ${iproute}/sbin/ip -6 addr add ${net.ip6.addr} dev ${netname} - ${iproute}/sbin/ip -6 route add ${net.ip6.prefix} dev ${netname} + ip -6 addr add ${net.ip6.addr} dev ${netname} + ip -6 route add ${net.ip6.prefix} dev ${netname} ''} ${tinc.config.tincUpExtra} ''; @@ -176,7 +175,7 @@ with import <stockholm/lib>; connectTo = mkOption { type = types.listOf types.str; ${if netname == "retiolum" then "default" else null} = [ - "gum" + "eve" "ni" "prism" ]; |