diff options
Diffstat (limited to 'custom/tinc')
-rw-r--r-- | custom/tinc/laeradhr.nix | 5 | ||||
-rw-r--r-- | custom/tinc/yggdrasil.nix | 5 |
2 files changed, 6 insertions, 4 deletions
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 @@ | |||
4 | , name | 4 | , name |
5 | , connect ? true | 5 | , connect ? true |
6 | , ipConf ? {} | 6 | , ipConf ? {} |
7 | , useDNS ? true | ||
7 | }: | 8 | }: |
8 | 9 | ||
9 | 10 | ||
@@ -19,10 +20,10 @@ in { | |||
19 | tinc-up = '' | 20 | tinc-up = '' |
20 | #!${stdenv.shell} | 21 | #!${stdenv.shell} |
21 | ${nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE metric 9999 | 22 | ${nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE metric 9999 |
22 | ${openresolv}/bin/resolvconf -m 0 -a tinc.laeradhr <<EOF | 23 | ${if useDNS then ''${openresolv}/bin/resolvconf -m 0 -a tinc.laeradhr <<EOF |
23 | domain yggdrasil | 24 | domain yggdrasil |
24 | nameserver 10.141.1.1 | 25 | nameserver 10.141.1.1 |
25 | EOF | 26 | EOF'' else ""} |
26 | ''; | 27 | ''; |
27 | tinc-down = '' | 28 | tinc-down = '' |
28 | #!${stdenv.shell} | 29 | #!${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 @@ | |||
4 | , name | 4 | , name |
5 | , connect ? true | 5 | , connect ? true |
6 | , ipConf ? {} | 6 | , ipConf ? {} |
7 | , useDNS ? true | ||
7 | }: | 8 | }: |
8 | 9 | ||
9 | 10 | ||
@@ -22,10 +23,10 @@ in { | |||
22 | tinc-up = '' | 23 | tinc-up = '' |
23 | #!${stdenv.shell} | 24 | #!${stdenv.shell} |
24 | ${nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE metric 9999 | 25 | ${nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE metric 9999 |
25 | ${openresolv}/bin/resolvconf -m 0 -a tinc.yggdrasil <<EOF | 26 | ${if useDNS then ''${openresolv}/bin/resolvconf -m 0 -a tinc.yggdrasil <<EOF |
26 | domain yggdrasil | 27 | domain yggdrasil |
27 | nameserver 10.141.1.1 | 28 | nameserver 10.141.1.1 |
28 | EOF | 29 | EOF'' else ""} |
29 | ''; | 30 | ''; |
30 | tinc-down = '' | 31 | tinc-down = '' |
31 | #!${stdenv.shell} | 32 | #!${stdenv.shell} |