From 332d4f5e1719df2b27f835c4fd0718317867043c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 3 Feb 2022 08:58:00 +0100
Subject: tinc: use ip from path

---
 krebs/3modules/tinc.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'krebs/3modules/tinc.nix')

diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix
index 31371af59..fe1b224c8 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}
           '';
-- 
cgit v1.2.3


From 0ec9ceb5d5e7f352084d3e564a3ad8e2cfe4e8f9 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 8 Feb 2022 18:20:21 +0100
Subject: tinc: don't connect to gum

---
 krebs/3modules/tinc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules/tinc.nix')

diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix
index fe1b224c8..bc85aa0a6 100644
--- a/krebs/3modules/tinc.nix
+++ b/krebs/3modules/tinc.nix
@@ -175,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"
           ];
-- 
cgit v1.2.3