From 228b191389b989dcbec609e52371f0dda33ef51b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 23 Apr 2018 11:57:23 +0200
Subject: dns via dhcp

---
 custom/tinc/yggdrasil.nix | 29 -----------------------------
 ymir.nix                  |  3 +++
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index 34933a19..2caa74a0 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -4,25 +4,6 @@ with lib;
 
 let
   cfg = config.services.yggdrasilTinc;
-
-  heimdallr-up = pkgs.writeScript "heimdallr-up.sh" ''
-    #!${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
-    ${optionalString cfg.useDNS ''
-      ${pkgs.openresolv}/bin/resolvconf -m 0 -a yggdrasil <<EOF
-      domain yggdrasil
-      nameserver 10.141.1.1
-      EOF
-    ''}
-  '';
-
-  heimdallr-down = pkgs.writeScript "heimdallr-down.sh" ''
-    #!${pkgs.stdenv.shell}
-    ${pkgs.nettools}/bin/route del -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE
-    ${optionalString cfg.useDNS ''
-      ${pkgs.openresolv}/bin/resolvconf -d yggdrasil
-    ''}
-  '';
 in {
   options = {
     services.yggdrasilTinc = {
@@ -87,16 +68,6 @@ in {
           MACFILE="/var/db/$NETNAME.mac"
           [ -e $MACFILE ] && ${pkgs.iproute}/bin/ip link set dev $INTERFACE address `cat $MACFILE` || cat /sys/class/net/$INTERFACE/address >$MACFILE
         '';
-        "hosts/heimdallr-up" = ''
-          #!${pkgs.stdenv.shell}
-
-          exec ${config.security.wrapperDir}/sudo -En ${heimdallr-up}
-        '';
-        "hosts/heimdallr-down" = ''
-          #!${pkgs.stdenv.shell}
-
-          exec ${config.security.wrapperDir}/sudo -En ${heimdallr-down}
-        '';
       };
     };
   };
diff --git a/ymir.nix b/ymir.nix
index 45c0668b..0c2d4c2b 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -928,6 +928,9 @@ in rec {
 
         option rfc3442-classless-static-routes 24, 10, 141, 4, 10, 141, 1, 5, 24, 10, 141, 1, 10, 141, 1, 1;
         option ms-classless-static-routes 24, 10, 141, 4, 10, 141, 1, 5, 24, 10, 141, 1, 10, 141, 1, 1;
+
+        option domain-name "yggdrasil";
+        option domain-name-servers 10.141.1.1, 8.8.8.8, 8.8.4.4;
       }
     '';
   };
-- 
cgit v1.2.3