summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-11-04 16:16:24 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2015-11-04 16:16:24 +0100
commitbba720e3c548fdf246255b3364e2a696576674a3 (patch)
treee1bf21f8b4b164f1e12507f17ae4f654ef8a6213
parentd7586c8dd6344813dd780f3e249c236be2735aaa (diff)
downloadnixos-bba720e3c548fdf246255b3364e2a696576674a3.tar
nixos-bba720e3c548fdf246255b3364e2a696576674a3.tar.gz
nixos-bba720e3c548fdf246255b3364e2a696576674a3.tar.bz2
nixos-bba720e3c548fdf246255b3364e2a696576674a3.tar.xz
nixos-bba720e3c548fdf246255b3364e2a696576674a3.zip
ip fixed for ymir
m---------laeradhr0
m---------yggdrasil0
-rw-r--r--ymir.nix4
3 files changed, 2 insertions, 2 deletions
diff --git a/laeradhr b/laeradhr
Subproject 8deeec8ce1c4f533d28ae60cac78309d0e2d00f Subproject a6d68909635efe1d96ed6de4c146b01c72bf12d
diff --git a/yggdrasil b/yggdrasil
Subproject c906363c4c804bcf926641288265df4c81575b3 Subproject a970f36880c8afd7c9a9e87228146da8d6166a9
diff --git a/ymir.nix b/ymir.nix
index 5ba015b9..4461bcdd 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -152,7 +152,7 @@ in {
152 name = "ymir"; 152 name = "ymir";
153 connect = false; 153 connect = false;
154 ipConf = { 154 ipConf = {
155 ip4 = [ { address = "10.141.4.1"; prefixLength = 24; } ]; 155 ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ];
156 }; 156 };
157 }) 157 })
158 // ((import ./custom/tinc/laeradhr.nix) { 158 // ((import ./custom/tinc/laeradhr.nix) {
@@ -160,7 +160,7 @@ in {
160 name = "ymir"; 160 name = "ymir";
161 connect = false; 161 connect = false;
162 ipConf = { 162 ipConf = {
163 ip4 = [ { address = "10.142.0.3"; prefixLength = 24; } ]; 163 ip4 = [ { address = "10.142.0.3"; prefixLength = 16; } ];
164 }; 164 };
165 }); 165 });
166} 166}