diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-11-04 13:51:56 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-11-04 13:51:56 +0100 |
| commit | eba59ad69607c8132317b986fed2403502dc646f (patch) | |
| tree | 5de5ac9347604793fd17dba9380df2e45ce861a9 /custom | |
| parent | 3b3084fb1057fa4332c5c59cc34bea58a8f3d3dd (diff) | |
| download | nixos-eba59ad69607c8132317b986fed2403502dc646f.tar nixos-eba59ad69607c8132317b986fed2403502dc646f.tar.gz nixos-eba59ad69607c8132317b986fed2403502dc646f.tar.bz2 nixos-eba59ad69607c8132317b986fed2403502dc646f.tar.xz nixos-eba59ad69607c8132317b986fed2403502dc646f.zip | |
structure poking
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/tinc/yggdrasil.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix index ef673c80..4191d2c4 100644 --- a/custom/tinc/yggdrasil.nix +++ b/custom/tinc/yggdrasil.nix | |||
| @@ -1,10 +1,9 @@ | |||
| 1 | { config | 1 | { stdenv |
| 2 | , stdenv | ||
| 3 | , nettools | 2 | , nettools |
| 4 | , openresolv | 3 | , openresolv |
| 4 | , name | ||
| 5 | , connect ? true | 5 | , connect ? true |
| 6 | , ipConf ? {} | 6 | , ipConf ? {} |
| 7 | , ... | ||
| 8 | }: | 7 | }: |
| 9 | 8 | ||
| 10 | 9 | ||
| @@ -12,7 +11,7 @@ let | |||
| 12 | connectTo = if connect then "" else "ConnectTo = ymir"; | 11 | connectTo = if connect then "" else "ConnectTo = ymir"; |
| 13 | in { | 12 | in { |
| 14 | "yggdrasil" = { | 13 | "yggdrasil" = { |
| 15 | name = config.networking.hostName; | 14 | inherit name; |
| 16 | debugLevel = 2; | 15 | debugLevel = 2; |
| 17 | hosts = ( import ./yggdrasil-hosts.nix ); | 16 | hosts = ( import ./yggdrasil-hosts.nix ); |
| 18 | extraConfig = connectTo; | 17 | extraConfig = connectTo; |