3 files changed, 94 insertions, 48 deletions

diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index 46d815a3..035b9b10 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -1,42 +1,85 @@
-{ stdenv
-, nettools
-, openresolv
-, name
-, connect ? true
-, ipConf ? {}
-, useDNS ? true
-}:
-
-with stdenv.lib;
-
-{
-  "yggdrasil" = {
-    inherit name;
-    debugLevel = 2;
-    hosts = ( import ./hosts/yggdrasil.nix );
-    extraConfig = ''
-      PingTimeout = 10
-      ${optionalString connect "ConnectTo = ymir"}
-    '';
-    scripts = {
-      "hosts/borealis-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
-        ${optionalString useDNS ''
-          ${openresolv}/bin/resolvconf -m 0 -a tinc.yggdrasil <<EOF
-          domain yggdrasil
-          nameserver 10.141.1.1
-          EOF
-        ''}
-      '';
-      "hosts/borealis-down" = ''
-        #!${stdenv.shell}
-        ${nettools}/bin/route del -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE
-        ${optionalString useDNS ''
-          ${openresolv}/bin/resolvconf -d tinc.yggdrasil
-        ''}
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.yggdrasilTinc;
+in {
+
+  options = {
+    services.yggdrasilTinc = {
+      enable = mkEnableOption "yggdrasil tinc network";
+      
+      connect = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          Connect to central server
+        '';
+      };
+
+      useDNS = mkOption {
+        default = true;
+        types = types.bool;
+        description = ''
+          Use borealis as primary dns server
+        '';
+      };
+
+      name = mkOption {
+        default = config.networking.hostName;
+        types = types.str;
+        description = ''
+          Node identifier
+        '';
+      };
+
+      interfaceConfig = mkOption {
+        default = {};
+        description = ''
+          Additional configuration for the generated network interface
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.customTinc.networks."yggdrasil" = {
+      inherit (cfg) name interfaceConfig;
+      debugLevel = 2;
+      hosts = ( import ./hosts/yggdrasil.nix );
+      extraConfig = ''
+        PingTimeout = 10
+        ${optionalString cfg.connect "ConnectTo = ymir"}
       '';
+      scripts = {
+        "hosts/borealis-up" = "${config.security.wrapperDir}/borealis-up";
+        "hosts/borealis-down" = "${config.security.wrapperDir}/borealis-down";
+      };
+    };
+
+    security.wrappers = {
+      "borealis-up" = {
+        source = pkgs.writeScript "borealis-up.sh" ''
+          #!${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
+          ${optionalString cfg.useDNS ''
+            ${openresolv}/bin/resolvconf -m 0 -a tinc.yggdrasil <<EOF
+            domain yggdrasil
+            nameserver 10.141.1.1
+            EOF
+          ''}
+        '';
+      };
+      "borealis-down" = {
+        source = pkgs.writeScript "borealis-down.sh" ''
+          #!${stdenv.shell}
+          ${nettools}/bin/route del -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE
+          ${optionalString cfg.useDNS ''
+            ${openresolv}/bin/resolvconf -d tinc.yggdrasil
+          ''}
+        '';
+      };
     };
-    interfaceConfig = ipConf;
   };
 }
diff --git a/hel.nix b/hel.nix
index 544cd7f0..4a3b6606 100644
--- a/hel.nix
+++ b/hel.nix
@@ -12,6 +12,7 @@
       ./users.nix
       ./custom/zsh.nix
       ./custom/tinc/def.nix
+      ./custom/tinc/yggdrasil.nix
       ./custom/uucp.nix
     ];
 
@@ -178,14 +179,15 @@
     ntp.enable = false;
     timesyncd.enable = true;
 
-    customTinc.networks = ((import ./custom/tinc/yggdrasil.nix) {
-      inherit (pkgs) stdenv nettools openresolv;
+    yggdrasilTinc = {
+      enable = true;
       connect = true;
       name = "hel";
-      ipConf = {
+      interfaceConfig = {
         ip4 = [ { address = "10.141.2.3"; prefixLength = 16; } ];
       };
-    });
+    };
+
     uucp = {
       enable = true;
       nodeName = "hel";
diff --git a/ymir.nix b/ymir.nix
index e02be94d..d74fcd9c 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -30,6 +30,7 @@ in rec {
       ./custom/zsh.nix
       ./users.nix
       ./custom/tinc/def.nix
+      ./custom/tinc/yggdrasil.nix
       ./custom/ymir-nginx.nix
       ./custom/uucp.nix
       ./custom/unit-status-mail.nix
@@ -271,16 +272,16 @@ in rec {
     chmod 0640 /etc/shadow
   '';
 
-  services.customTinc.networks = ((import ./custom/tinc/yggdrasil.nix) {
-    inherit (pkgs) stdenv nettools openresolv;
-    name = "ymir";
+  services.yggdrasilTinc = {
+    enable = true;
     connect = false;
     useDNS = false;
-    ipConf = {
+    interfaceConfig = {
       ip4 = [ { address = "10.141.5.1"; prefixLength = 16; } ];
     };
-    })
-    // ((import ./custom/tinc/laeradhr.nix) {
+  };
+
+  services.customTinc.networks = ((import ./custom/tinc/laeradhr.nix) {
      inherit (pkgs) stdenv nettools openresolv;
     name = "ymir";
     connect = false;