From 2d0c6819a5c8d7a0d2f4eceac1dc9ef6404cf762 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Tue, 11 Jun 2019 19:28:19 +0200
Subject: [PATCH] #651 changed parameters

---
 FAQ.md                                          | 4 ++++
 home.admin/config.scripts/internet.sshtunnel.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/FAQ.md b/FAQ.md
index 0f7a9b6..2e84cdc 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -750,8 +750,12 @@ RSAAuthentication yes
 PubkeyAuthentication yes
 GatewayPorts yes
 AllowTcpForwarding yes
+ClientAliveInterval 60
+ClientAliveCountMax=2
 ```
 
+*Last two paramters were added as used in the ssh tunnel demo at #GPN19 https://media.ccc.de/v/gpn19-76-einen-server-daheim-ohne-ffentliche-ipv4-adresse#t=911*
+
 You can add those at the end of the file, save and reboot.
 
 On the RaspiBlitz you can then setup for example to forward the gRPC port 10009 (internal port) to the port 20009 on the public server (external port) with the user = `test` and server address = `raspiblitz.com` with the following command:
diff --git a/home.admin/config.scripts/internet.sshtunnel.py b/home.admin/config.scripts/internet.sshtunnel.py
index 4516d93..d021c91 100755
--- a/home.admin/config.scripts/internet.sshtunnel.py
+++ b/home.admin/config.scripts/internet.sshtunnel.py
@@ -30,7 +30,7 @@ After=network.target
 User=root
 Group=root
 Environment="AUTOSSH_GATETIME=0"
-ExecStart=/usr/bin/autossh -M 0 -N -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o "ServerAliveInterval 30" -o "ServerAliveCountMax 3" [PLACEHOLDER]
+ExecStart=/usr/bin/autossh -M 0 -N -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ServerAliveInterval=60 -o ServerAliveCountMax=2 [PLACEHOLDER]
 StandardOutput=journal
 
 [Install]