1 files changed, 9 insertions, 9 deletions
diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix
index 21ddde1c..bc85aa0a 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}
               '';
             });
@@ -48,7 +48,7 @@ with import <stockholm/lib>;
         };
 
         extraConfig = mkOption {
-          type = types.str;
+          type = types.lines;
           default = "";
           description = ''
             Extra Configuration to be appended to tinc.conf
@@ -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"
           ];
@@ -233,6 +232,7 @@ with import <stockholm/lib>;
         cfg.iproutePackage
         cfg.tincPackage
       ];
+      reloadIfChanged = true;
       serviceConfig = {
         Restart = "always";
         LoadCredential = filter (x: x != "") [
@@ -260,7 +260,7 @@ with import <stockholm/lib>;
           "-o PrivateKeyFile=\${CREDENTIALS_DIRECTORY}/rsa_key"
           "--pidfile=/var/run/tinc.${netname}.pid"
         ];
-        ExecReload = "${cfg.tincPackage}/sbin/tinc -n ${netname} reload";
+        ExecReload = "${cfg.tincPackage}/sbin/tinc -n ${netname} restart";
         SyslogIdentifier = netname;
       };
     }) config.krebs.tinc;