diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-17 19:27:48 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-17 19:27:48 +0200 |
commit | 1213d7aeeea018043372370e6ef4229def72b6eb (patch) | |
tree | be557fc65e7c5e9665e4887ad02d2f5fdb977276 | |
parent | e7e58b90a986d9167cfe5a6821a52568e9aeaf89 (diff) | |
download | nixos-1213d7aeeea018043372370e6ef4229def72b6eb.tar nixos-1213d7aeeea018043372370e6ef4229def72b6eb.tar.gz nixos-1213d7aeeea018043372370e6ef4229def72b6eb.tar.bz2 nixos-1213d7aeeea018043372370e6ef4229def72b6eb.tar.xz nixos-1213d7aeeea018043372370e6ef4229def72b6eb.zip |
…
-rw-r--r-- | custom/tinc/yggdrasil.nix | 2 | ||||
-rw-r--r-- | hel.nix | 3 | ||||
-rw-r--r-- | ymir.nix | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix index 73c8276e..337cd7f1 100644 --- a/custom/tinc/yggdrasil.nix +++ b/custom/tinc/yggdrasil.nix | |||
@@ -72,7 +72,7 @@ in { | |||
72 | services.customTinc.networks."yggdrasil" = { | 72 | services.customTinc.networks."yggdrasil" = { |
73 | inherit (cfg) name interfaceConfig; | 73 | inherit (cfg) name interfaceConfig; |
74 | debugLevel = 2; | 74 | debugLevel = 2; |
75 | hosts = ( import ./hosts/yggdrasil.nix ); | 75 | hosts = import ../../yggdrasil/hosts.nix; |
76 | extraConfig = '' | 76 | extraConfig = '' |
77 | Mode = switch | 77 | Mode = switch |
78 | PingTimeout = 30 | 78 | PingTimeout = 30 |
@@ -193,9 +193,6 @@ | |||
193 | enable = true; | 193 | enable = true; |
194 | connect = true; | 194 | connect = true; |
195 | name = "hel"; | 195 | name = "hel"; |
196 | interfaceConfig = { | ||
197 | ipv4.addresses = [ { address = "10.141.2.3"; prefixLength = 16; } ]; | ||
198 | }; | ||
199 | }; | 196 | }; |
200 | 197 | ||
201 | uucp = { | 198 | uucp = { |
@@ -309,9 +309,6 @@ in rec { | |||
309 | enable = true; | 309 | enable = true; |
310 | connect = false; | 310 | connect = false; |
311 | useDNS = false; | 311 | useDNS = false; |
312 | interfaceConfig = { | ||
313 | ipv4.addresses = [ { address = "10.141.5.1"; prefixLength = 16; } ]; | ||
314 | }; | ||
315 | }; | 312 | }; |
316 | 313 | ||
317 | services.customTinc.networks = ((import ./custom/tinc/laeradhr.nix) { | 314 | services.customTinc.networks = ((import ./custom/tinc/laeradhr.nix) { |