From 67606c341a7bb78dad44d120b0387e82d5e26a28 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 24 Oct 2016 19:47:13 +0200
Subject: DANE

---
 custom/tinc/laeradhr.nix  | 5 +++--
 custom/tinc/yggdrasil.nix | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'custom/tinc')

diff --git a/custom/tinc/laeradhr.nix b/custom/tinc/laeradhr.nix
index b40e3d2a..abf309f0 100644
--- a/custom/tinc/laeradhr.nix
+++ b/custom/tinc/laeradhr.nix
@@ -4,6 +4,7 @@
 , name
 , connect ? true
 , ipConf ? {}
+, useDNS ? true
 }:
 
 
@@ -19,10 +20,10 @@ in {
       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
+        ${if useDNS then ''${openresolv}/bin/resolvconf -m 0 -a tinc.laeradhr <<EOF
         domain yggdrasil
         nameserver 10.141.1.1
-        EOF
+        EOF'' else ""}
       '';
       tinc-down = ''
         #!${stdenv.shell}
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index 7c028824..53b8b85e 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -4,6 +4,7 @@
 , name
 , connect ? true
 , ipConf ? {}
+, useDNS ? true
 }:
 
 
@@ -22,10 +23,10 @@ in {
       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
+        ${if useDNS then ''${openresolv}/bin/resolvconf -m 0 -a tinc.yggdrasil <<EOF
         domain yggdrasil
         nameserver 10.141.1.1
-        EOF
+        EOF'' else ""}
       '';
       tinc-down = ''
         #!${stdenv.shell}
-- 
cgit v1.2.3