From 9d88bc85267dc0b66dec37f8f8f65e46803a5138 Mon Sep 17 00:00:00 2001
From: Jon Ayers <jon@coder.com>
Date: Wed, 19 May 2021 19:18:10 +0000
Subject: [PATCH 1/2] coder: remove some unnecessary SSH settings

- Removed ServerAliveInterval and ServerAliveCountMax from config-ssh
  settings. These settings are opinionated about when idle sessions
  should disconnect and should be inherited from the user's global settings.
  'coder config-ssh' should only write configuration options that are
  necessary for 'coder sh' and its variants to succeed.
---
 cmd/coder/wac.yaml        | 25 +++++++++++++++++++++++++
 internal/cmd/configssh.go |  4 ----
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 cmd/coder/wac.yaml

diff --git a/cmd/coder/wac.yaml b/cmd/coder/wac.yaml
new file mode 100644
index 00000000..8d054679
--- /dev/null
+++ b/cmd/coder/wac.yaml
@@ -0,0 +1,25 @@
+version: 0.2
+workspace:
+  type: "kubernetes"
+  specs:
+    kubernetes:
+      image: 
+        value: "index.docker.io/ubuntu"
+      container-based-vm: 
+        value: false
+      cpu: 
+        value: 1
+      memory: 
+        value: 1
+      disk: 
+        value: 30
+      labels:
+        value:
+          coder: "woohoo"
+          wac: "hooray"
+      env:
+        value: 
+          - key: TEST_ME
+            value: "hooray"
+          - key: TEST2
+            value: "yippee"
diff --git a/internal/cmd/configssh.go b/internal/cmd/configssh.go
index 9417c514..7f79d6da 100644
--- a/internal/cmd/configssh.go
+++ b/internal/cmd/configssh.go
@@ -230,8 +230,6 @@ func makeSSHConfig(host, userName, workspaceName, privateKeyFilepath string, tun
    ConnectTimeout=0
    IdentitiesOnly yes
    IdentityFile="%s"
-   ServerAliveInterval 60
-   ServerAliveCountMax 3
 `, workspaceName, workspaceName, workspaceName, privateKeyFilepath)
 	}
 
@@ -243,8 +241,6 @@ func makeSSHConfig(host, userName, workspaceName, privateKeyFilepath string, tun
    ConnectTimeout=0
    IdentitiesOnly yes
    IdentityFile="%s"
-   ServerAliveInterval 60
-   ServerAliveCountMax 3
 `, workspaceName, host, userName, workspaceName, privateKeyFilepath)
 }
 

From 6f580686db7acbca6bbd2c6f30b0e5cff4037314 Mon Sep 17 00:00:00 2001
From: Jon Ayers <jon@coder.com>
Date: Wed, 19 May 2021 19:25:00 +0000
Subject: [PATCH 2/2] remove errant file

---
 cmd/coder/wac.yaml | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 cmd/coder/wac.yaml

diff --git a/cmd/coder/wac.yaml b/cmd/coder/wac.yaml
deleted file mode 100644
index 8d054679..00000000
--- a/cmd/coder/wac.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-version: 0.2
-workspace:
-  type: "kubernetes"
-  specs:
-    kubernetes:
-      image: 
-        value: "index.docker.io/ubuntu"
-      container-based-vm: 
-        value: false
-      cpu: 
-        value: 1
-      memory: 
-        value: 1
-      disk: 
-        value: 30
-      labels:
-        value:
-          coder: "woohoo"
-          wac: "hooray"
-      env:
-        value: 
-          - key: TEST_ME
-            value: "hooray"
-          - key: TEST2
-            value: "yippee"