diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-11-04 13:47:16 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-11-04 13:47:16 +0100 |
commit | 151d88187234cc4127665371ed27327d2996664e (patch) | |
tree | 36d37ed86b2ce7ceb72c98807816825b588fc946 | |
parent | 321c04eb381a95626aea2cf350dae1ea1a3e7559 (diff) | |
download | nixos-151d88187234cc4127665371ed27327d2996664e.tar nixos-151d88187234cc4127665371ed27327d2996664e.tar.gz nixos-151d88187234cc4127665371ed27327d2996664e.tar.bz2 nixos-151d88187234cc4127665371ed27327d2996664e.tar.xz nixos-151d88187234cc4127665371ed27327d2996664e.zip |
name needs declaration
-rw-r--r-- | custom/tinc/yggdrasil.nix | 3 | ||||
-rw-r--r-- | ymir.nix | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix index f6aa00b8..4191d2c4 100644 --- a/custom/tinc/yggdrasil.nix +++ b/custom/tinc/yggdrasil.nix | |||
@@ -1,6 +1,7 @@ | |||
1 | { stdenv | 1 | { stdenv |
2 | , nettools | 2 | , nettools |
3 | , openresolv | 3 | , openresolv |
4 | , name | ||
4 | , connect ? true | 5 | , connect ? true |
5 | , ipConf ? {} | 6 | , ipConf ? {} |
6 | }: | 7 | }: |
@@ -10,7 +11,7 @@ let | |||
10 | connectTo = if connect then "" else "ConnectTo = ymir"; | 11 | connectTo = if connect then "" else "ConnectTo = ymir"; |
11 | in { | 12 | in { |
12 | "yggdrasil" = { | 13 | "yggdrasil" = { |
13 | name = name; | 14 | inherit name; |
14 | debugLevel = 2; | 15 | debugLevel = 2; |
15 | hosts = ( import ./yggdrasil-hosts.nix ); | 16 | hosts = ( import ./yggdrasil-hosts.nix ); |
16 | extraConfig = connectTo; | 17 | extraConfig = connectTo; |
@@ -146,6 +146,7 @@ in { | |||
146 | ''; | 146 | ''; |
147 | 147 | ||
148 | services.customTinc.networks = (pkgs.callPackage ./custom/tinc/yggdrasil.nix { | 148 | services.customTinc.networks = (pkgs.callPackage ./custom/tinc/yggdrasil.nix { |
149 | name = config.networking.hostName; | ||
149 | connect = false; | 150 | connect = false; |
150 | ipConf = { | 151 | ipConf = { |
151 | ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ]; | 152 | ip4 = [ { address = "10.141.4.1"; prefixLength = 16; } ]; |