laeradhr

2 files changed, 38 insertions, 32 deletions

diff --git a/custom/tinc/laeradhr.nix b/custom/tinc/laeradhr.nix
index 7db4bec8..8471f020 100644
--- a/custom/tinc/laeradhr.nix
+++ b/custom/tinc/laeradhr.nix
@@ -1,36 +1,34 @@
-{ config, pkgs, ... }:
+{ stdenv
+, nettools
+, openresolv
+, name
+, connect ? true
+, ipConf ? {}
+}:
+
 
 let
-  name = "unknown";
-  ip = "xxx.xxx.xxx.xxx";
+  connectTo = if connect then "" else "ConnectTo = ymir";
 in {
-  config.services.tinc = {
-    networks = {
-      "laeradhr" = {
-        name = name;
-                                debugLevel = 2;
-                                hosts = ( import ./laeradhr-hosts.nix );
-                                extraConfig = "ConnectTo = surtr";
-                                scripts = {
-                                  tinc-up = ''
-            #!${pkgs.stdenv.shell}
-            ${pkgs.nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.142.0.2 dev $INTERFACE metric 9999
-            ${pkgs.openresolv}/bin/resolvconf -m 0 -a tinc.laeradhr <<EOF
-            domain yggdrasil
-            nameserver 10.141.1.1
-            EOF'';
-                                        tinc-down = ''
-                                                #!${pkgs.stdenv.shell}
-            ${pkgs.openresolv}/bin/resolvconf -d tinc.laeradhr'';
-                                };
-                        };
-                };
-        };
-
-        config.networking.interfaces."tinc.laeradhr" = {
-    useDHCP = false;
-                ip4 = [
-      { address = ip; prefixLength = 16; }
-                ];
-        };
+  "laeradhr" = {
+    inherit name;
+    debugLevel = 2;
+    hosts = ( import ./laeradhr-hosts.nix );
+    extraConfig = connectTo;
+    scripts = {
+      tinc-up = ''
+        #!${stdenv.shell}
+        ${nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE metric 9999
+        ${openresolv}/bin/resolvconf -m 0 -a tinc.laeradhr <<EOF
+        domain yggdrasil
+        nameserver 10.141.1.1
+        EOF
+      '';
+      tinc-down = ''
+        #!${stdenv.shell}
+        ${openresolv}/bin/resolvconf -d tinc.laeradhr
+      '';
+    };
+    interfaceConfig = ipConf;
+  };
 }
diff --git a/ymir.nix b/ymir.nix
index 502e608b..69e18b72 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -152,5 +152,13 @@ in {
     ipConf = {
       ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ];
     };
+    })
+    // ((import ./custom/tinc/laeradhr.nix) {
+     inherit (pkgs) stdenv nettools openresolv;
+    name = "ymir";
+    connect = false;
+    ipConf = {
+      ip4 = [ { address = "10.142.0.3"; prefixLength = 16; } ];
+    };
     });
 }