summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-12-19 17:33:48 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-12-19 17:33:48 +0100
commitb3a5a87eb092c8ee289a96ce81e1cc9def4a4d55 (patch)
tree24f185da4dfff9710df5d345533a2c6a8cfd27c5
parent94e84db5e101c28b5d8e0d385dd25bca2d7a8f7d (diff)
downloadnixos-b3a5a87eb092c8ee289a96ce81e1cc9def4a4d55.tar
nixos-b3a5a87eb092c8ee289a96ce81e1cc9def4a4d55.tar.gz
nixos-b3a5a87eb092c8ee289a96ce81e1cc9def4a4d55.tar.bz2
nixos-b3a5a87eb092c8ee289a96ce81e1cc9def4a4d55.tar.xz
nixos-b3a5a87eb092c8ee289a96ce81e1cc9def4a4d55.zip
more generous tinc timeout
-rw-r--r--custom/tinc/yggdrasil.nix2
-rw-r--r--ymir.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/custom/tinc/yggdrasil.nix b/custom/tinc/yggdrasil.nix
index d0492793..dba81120 100644
--- a/custom/tinc/yggdrasil.nix
+++ b/custom/tinc/yggdrasil.nix
@@ -74,7 +74,7 @@ in {
74 debugLevel = 2; 74 debugLevel = 2;
75 hosts = ( import ./hosts/yggdrasil.nix ); 75 hosts = ( import ./hosts/yggdrasil.nix );
76 extraConfig = '' 76 extraConfig = ''
77 PingTimeout = 10 77 PingTimeout = 30
78 ${optionalString cfg.connect "ConnectTo = ymir"} 78 ${optionalString cfg.connect "ConnectTo = ymir"}
79 ''; 79 '';
80 scripts = { 80 scripts = {
diff --git a/ymir.nix b/ymir.nix
index c1855cd9..bd1d54e1 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -319,14 +319,14 @@ in rec {
319 }; 319 };
320 320
321 services.customTinc.networks = ((import ./custom/tinc/laeradhr.nix) { 321 services.customTinc.networks = ((import ./custom/tinc/laeradhr.nix) {
322 inherit (pkgs) stdenv nettools openresolv; 322 inherit (pkgs) stdenv nettools openresolv;
323 name = "ymir"; 323 name = "ymir";
324 connect = false; 324 connect = false;
325 useDNS = false; 325 useDNS = false;
326 ipConf = { 326 ipConf = {
327 ip4 = [ { address = "10.142.0.3"; prefixLength = 16; } ]; 327 ip4 = [ { address = "10.142.0.3"; prefixLength = 16; } ];
328 }; 328 };
329 }); 329 });
330 330
331 users.extraUsers."nginx".extraGroups = ["uwsgi"]; 331 users.extraUsers."nginx".extraGroups = ["uwsgi"];
332 332