From 151d88187234cc4127665371ed27327d2996664e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 4 Nov 2015 13:47:16 +0100
Subject: name needs declaration

---
 custom/tinc/yggdrasil.nix | 3 ++-
 ymir.nix                  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index f6aa00b8..4191d2c4 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -1,6 +1,7 @@
 { stdenv
 , nettools
 , openresolv
+, name
 , connect ? true
 , ipConf ? {}
 }:
@@ -10,7 +11,7 @@ let
   connectTo = if connect then "" else "ConnectTo = ymir";
 in {
   "yggdrasil" = {
-    name = name;
+    inherit name;
     debugLevel = 2;
     hosts = ( import ./yggdrasil-hosts.nix );
     extraConfig = connectTo;
diff --git a/ymir.nix b/ymir.nix
index 1c9d8aa3..10be9994 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -146,6 +146,7 @@ in {
   '';
 
   services.customTinc.networks = (pkgs.callPackage ./custom/tinc/yggdrasil.nix {
+    name = config.networking.hostName;
     connect = false;
     ipConf = {
       ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ];
-- 
cgit v1.2.3