tinc rewrite

1 files changed, 30 insertions, 27 deletions

diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index 4c19e0e7..a4309278 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -1,30 +1,33 @@
-{ config, pkgs, name, ip }:
+{ stdenv
+, nettools
+, openresolv
+, connect ? true
+, ipConf ? {}
+}
 
-{
-  config.services.tinc = {
-    networks = {
-      "yggdrasil" = {
-        name = name;
-                                debugLevel = 2;
-                                hosts = ( import ./yggdrasil-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.141.1.1 dev $INTERFACE metric 9999
-            ${pkgs.openresolv}/bin/resolvconf -m 0 -a tinc.yggdrasil <<EOF
-            domain yggdrasil
-            nameserver 10.141.1.1
-            EOF'';
-                                        tinc-down = ''
-                                                #!${pkgs.stdenv.shell}
-            ${pkgs.openresolv}/bin/resolvconf -d tinc.yggdrasil'';
-                                };
-                        };
-                };
-        };
 
-        config.networking.interfaces."tinc.yggdrasil" = {
-    useDHCP = false;
-        } // ip;
+let
+  connectTo = if connect then "" else "ConnectTo = ymir"
+{
+  "yggdrasil" = {
+    name = name;
+    debugLevel = 2;
+    hosts = ( import ./yggdrasil-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.yggdrasil <<EOF
+        domain yggdrasil
+        nameserver 10.141.1.1
+        EOF
+      '';
+      tinc-down = ''
+        #!${stdenv.shell}
+        ${openresolv}/bin/resolvconf -d tinc.yggdrasil
+      '';
+    };
+    interfaceConfig = ipConf;
+  };
 }