summaryrefslogtreecommitdiff
path: root/custom
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-11-04 13:48:49 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2015-11-04 13:48:49 +0100
commit2f3c3ccc236cc25f382d033a74b7b94c22add065 (patch)
tree5b124c730f58348ebf4a38ea631345b8a9baa9b6 /custom
parent151d88187234cc4127665371ed27327d2996664e (diff)
downloadnixos-2f3c3ccc236cc25f382d033a74b7b94c22add065.tar
nixos-2f3c3ccc236cc25f382d033a74b7b94c22add065.tar.gz
nixos-2f3c3ccc236cc25f382d033a74b7b94c22add065.tar.bz2
nixos-2f3c3ccc236cc25f382d033a74b7b94c22add065.tar.xz
nixos-2f3c3ccc236cc25f382d033a74b7b94c22add065.zip
syntax poking
Diffstat (limited to 'custom')
-rw-r--r--custom/tinc/yggdrasil.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index 4191d2c4..d3569df4 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -1,7 +1,7 @@
1{ stdenv 1{ config
2, stdenv
2, nettools 3, nettools
3, openresolv 4, openresolv
4, name
5, connect ? true 5, connect ? true
6, ipConf ? {} 6, ipConf ? {}
7}: 7}:
@@ -11,7 +11,7 @@ let
11 connectTo = if connect then "" else "ConnectTo = ymir"; 11 connectTo = if connect then "" else "ConnectTo = ymir";
12in { 12in {
13 "yggdrasil" = { 13 "yggdrasil" = {
14 inherit name; 14 name = config.networking.hostName;
15 debugLevel = 2; 15 debugLevel = 2;
16 hosts = ( import ./yggdrasil-hosts.nix ); 16 hosts = ( import ./yggdrasil-hosts.nix );
17 extraConfig = connectTo; 17 extraConfig = connectTo;