From d6a37f91cb304c2025ed8f803265c0a4b072191c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 17 Apr 2018 20:06:22 +0200
Subject: rename iface

---
 custom/tinc/def.nix       | 4 ++--
 custom/tinc/yggdrasil.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'custom/tinc')

diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix
index 1602e477..2610a13f 100644
--- a/custom/tinc/def.nix
+++ b/custom/tinc/def.nix
@@ -127,7 +127,7 @@ in
               Name = ${if data.name == null then "$HOST" else data.name}
               DeviceType = ${data.interfaceType}
               Device = /dev/net/tun
-              Interface = tinc.${network}
+              Interface = ${network}
               ExperimentalProtocol = no
               ${data.extraConfig}
             '';
@@ -136,7 +136,7 @@ in
       ));
 
     networking.interfaces = flip mapAttrs' cfg.networks (network: data: nameValuePair
-      ("tinc.${network}")
+      (network)
       ({
         virtual = true;
         virtualType = "${data.interfaceType}";
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index 2da48486..175da1ec 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -9,7 +9,7 @@ let
     #!${pkgs.stdenv.shell}
     ${pkgs.nettools}/bin/route add -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE metric 9999
     ${optionalString cfg.useDNS ''
-      ${pkgs.openresolv}/bin/resolvconf -m 0 -a tinc.yggdrasil <<EOF
+      ${pkgs.openresolv}/bin/resolvconf -m 0 -a yggdrasil <<EOF
       domain yggdrasil
       nameserver 10.141.1.1
       EOF
@@ -20,7 +20,7 @@ let
     #!${pkgs.stdenv.shell}
     ${pkgs.nettools}/bin/route del -net 10.141.1.0 netmask 255.255.255.0 gw 10.141.1.1 dev $INTERFACE
     ${optionalString cfg.useDNS ''
-      ${pkgs.openresolv}/bin/resolvconf -d tinc.yggdrasil
+      ${pkgs.openresolv}/bin/resolvconf -d yggdrasil
     ''}
   '';
 in {
-- 
cgit v1.2.3