From 78bcfd24603b5c19979ed8502eb7e09b0b54229f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 2 Jul 2018 15:14:51 +0200
Subject: Static macAddresses

---
 custom/tinc/yggdrasil.nix | 9 ---------
 hel.nix                   | 1 +
 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 {
         PingTimeout = 30
         ${optionalString cfg.connect "ConnectTo = ymir"}
       '';
-      scripts = {
-        "tinc-up" = ''
-          #!${pkgs.stdenv.shell}
-
-          set -e
-          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
-        '';
-      };
     };
   };
 }
diff --git a/hel.nix b/hel.nix
index 6dd7861e..737ba305 100644
--- a/hel.nix
+++ b/hel.nix
@@ -200,6 +200,7 @@
       name = "hel";
       interfaceConfig = {
         useDHCP = true;
+        macAddress = "ee:10:15:9a:cc:1f";
       };
     };
 
diff --git a/ymir.nix b/ymir.nix
index 8769311d..6b061ffc 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -313,6 +313,7 @@ in rec {
     useDNS = false;
     interfaceConfig = {
       ipv4.addresses = [ { address = "10.141.5.1"; prefixLength = 16; } ];
+      macAddress = "2e:1b:73:b2:49:6d";
     };
   };
 
-- 
cgit v1.2.3