summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--custom/tinc/yggdrasil.nix9
-rw-r--r--hel.nix1
-rw-r--r--ymir.nix1
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}
diff --git a/hel.nix b/hel.nix
index 6dd7861e..737ba305 100644
--- a/hel.nix
+++ b/hel.nix
@@ -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
diff --git a/ymir.nix b/ymir.nix
index 8769311d..6b061ffc 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -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