From 4fbde3a1382537080bffd2f788c127e5549ab056 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 3 Nov 2015 22:02:28 +0100
Subject: tinc on ymir

---
 custom/tinc/yggdrasil.nix | 12 +++---------
 ymir.nix                  |  9 ++++++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index 54f47281..6b3bb5cc 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -1,9 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, name, ip }:
 
-let
-  name = "unknown";
-  ip = "xxx.xxx.xxx.xxx";
-in {
+{
   config.services.tinc = {
     networks = {
       "yggdrasil" = {
@@ -29,8 +26,5 @@ in {
 
 	config.networking.interfaces."tinc.yggdrasil" = {
     useDHCP = false;
-		ip4 = [
-      { address = ip; prefixLength = 16; }
-		];
-	};
+	} \\ ip;
 }
diff --git a/ymir.nix b/ymir.nix
index 52b6f15a..e554cdfa 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -140,4 +140,11 @@ in {
     members = [ "gkleen"
               ];
   };
-}
+} \\ (callPackage ./custom/tinc/yggdrasil.nix {
+  name = "ymir";
+  ip = {
+    ip4 = [
+      { address = "10.141.4.1"; prefixLength = 16; }
+    ];
+  };
+})
-- 
cgit v1.2.3