From acfccf582ffa58bc41873f9a75585ac788485258 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 4 Nov 2015 13:42:16 +0100 Subject: =?UTF-8?q?tinc=20=E2=86=92=20customTinc=20due=20to=20name=20colis?= =?UTF-8?q?sion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom/tinc/def.nix | 2 +- ymir.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix index 8f3ec969..237b6dee 100644 --- a/custom/tinc/def.nix +++ b/custom/tinc/def.nix @@ -4,7 +4,7 @@ with lib; let - cfg = config.services.tinc; + cfg = config.services.customTinc; in diff --git a/ymir.nix b/ymir.nix index 035dacb4..d0191532 100644 --- a/ymir.nix +++ b/ymir.nix @@ -145,7 +145,7 @@ in { chmod 0640 /etc/shadow ''; - services.tinc.networks = (pkgs.callPackage ./custom/yggdrasil.nix { + services.customTinc.networks = (pkgs.callPackage ./custom/yggdrasil.nix { connect = false; ipConf = { ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ]; -- cgit v1.2.3