summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-11-04 13:42:16 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2015-11-04 13:42:16 +0100
commitacfccf582ffa58bc41873f9a75585ac788485258 (patch)
tree94837eb8fb3072d77bd9a84f9733155923e20958
parent2db00f1538de87d4b535c8148ad066a80f07f94d (diff)
downloadnixos-acfccf582ffa58bc41873f9a75585ac788485258.tar
nixos-acfccf582ffa58bc41873f9a75585ac788485258.tar.gz
nixos-acfccf582ffa58bc41873f9a75585ac788485258.tar.bz2
nixos-acfccf582ffa58bc41873f9a75585ac788485258.tar.xz
nixos-acfccf582ffa58bc41873f9a75585ac788485258.zip
tinc → customTinc due to name colission
-rw-r--r--custom/tinc/def.nix2
-rw-r--r--ymir.nix2
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;
4 4
5let 5let
6 6
7 cfg = config.services.tinc; 7 cfg = config.services.customTinc;
8 8
9in 9in
10 10
diff --git a/ymir.nix b/ymir.nix
index 035dacb4..d0191532 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -145,7 +145,7 @@ in {
145 chmod 0640 /etc/shadow 145 chmod 0640 /etc/shadow
146 ''; 146 '';
147 147
148 services.tinc.networks = (pkgs.callPackage ./custom/yggdrasil.nix { 148 services.customTinc.networks = (pkgs.callPackage ./custom/yggdrasil.nix {
149 connect = false; 149 connect = false;
150 ipConf = { 150 ipConf = {
151 ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ]; 151 ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ];