diff options
-rw-r--r-- | custom/tinc/yggdrasil.nix | 9 | ||||
-rw-r--r-- | hel.nix | 1 | ||||
-rw-r--r-- | ymir.nix | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix index f5684d08..abc0eb14 100644 --- a/custom/tinc/yggdrasil.nix +++ b/custom/tinc/yggdrasil.nix | |||
@@ -53,15 +53,6 @@ in { | |||
53 | PingTimeout = 30 | 53 | PingTimeout = 30 |
54 | ${optionalString cfg.connect "ConnectTo = ymir"} | 54 | ${optionalString cfg.connect "ConnectTo = ymir"} |
55 | ''; | 55 | ''; |
56 | scripts = { | ||
57 | "tinc-up" = '' | ||
58 | #!${pkgs.stdenv.shell} | ||
59 | |||
60 | set -e | ||
61 | MACFILE="/var/db/$NETNAME.mac" | ||
62 | [ -e $MACFILE ] && ${pkgs.iproute}/bin/ip link set dev $INTERFACE address `cat $MACFILE` || cat /sys/class/net/$INTERFACE/address >$MACFILE | ||
63 | ''; | ||
64 | }; | ||
65 | }; | 56 | }; |
66 | }; | 57 | }; |
67 | } | 58 | } |
@@ -200,6 +200,7 @@ | |||
200 | name = "hel"; | 200 | name = "hel"; |
201 | interfaceConfig = { | 201 | interfaceConfig = { |
202 | useDHCP = true; | 202 | useDHCP = true; |
203 | macAddress = "ee:10:15:9a:cc:1f"; | ||
203 | }; | 204 | }; |
204 | }; | 205 | }; |
205 | 206 | ||
@@ -313,6 +313,7 @@ in rec { | |||
313 | useDNS = false; | 313 | useDNS = false; |
314 | interfaceConfig = { | 314 | interfaceConfig = { |
315 | ipv4.addresses = [ { address = "10.141.5.1"; prefixLength = 16; } ]; | 315 | ipv4.addresses = [ { address = "10.141.5.1"; prefixLength = 16; } ]; |
316 | macAddress = "2e:1b:73:b2:49:6d"; | ||
316 | }; | 317 | }; |
317 | }; | 318 | }; |
318 | 319 | ||