summaryrefslogtreecommitdiff
path: root/ymir.nix
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 /ymir.nix
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
Diffstat (limited to 'ymir.nix')
-rw-r--r--ymir.nix2
1 files changed, 1 insertions, 1 deletions
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; } ];