From b3a5a87eb092c8ee289a96ce81e1cc9def4a4d55 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 19 Dec 2017 17:33:48 +0100
Subject: more generous tinc timeout

---
 custom/tinc/yggdrasil.nix | 2 +-
 ymir.nix                  | 4 ++--
 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 {
       debugLevel = 2;
       hosts = ( import ./hosts/yggdrasil.nix );
       extraConfig = ''
-        PingTimeout = 10
+        PingTimeout = 30
         ${optionalString cfg.connect "ConnectTo = ymir"}
       '';
       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 {
   };
 
   services.customTinc.networks = ((import ./custom/tinc/laeradhr.nix) {
-     inherit (pkgs) stdenv nettools openresolv;
+    inherit (pkgs) stdenv nettools openresolv;
     name = "ymir";
     connect = false;
     useDNS = false;
     ipConf = {
       ip4 = [ { address = "10.142.0.3"; prefixLength = 16; } ];
     };
-    });
+  });
 
   users.extraUsers."nginx".extraGroups = ["uwsgi"];
 
-- 
cgit v1.2.3