X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/c89093a69b18cc10247693e2a39e92b5864b62e8..1d8b4c1b0a3f86ddf4c71e88ca4b3c269d73060c:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 831ff70..4f1cd9c 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -86,12 +86,6 @@ Host ssh443.madduck.net | ssh443
 Host openvpn.madduck.net | openvpn
   HostKeyAlias sysyphus.madduck.net
 
-Host wots.madduck.net | wots
-  ForwardAgent yes
-  Hostname wots.madduck.net
-Host buildd.debian.madduck.net | buildd
-  HostKeyAlias wots.madduck.net
-
 ### UNI ZURICH MACHINES
 
 Host diamond.madduck.net | diamond
@@ -138,17 +132,14 @@ Host swan-host | swan-host.madduck.net
   User krafft
 
 Host swan.madduck.net | swan
-  ForwardAgent yes
   Hostname swan.madduck.net
 
-Host pulse.madduck.net | pulse
-  ForwardAgent yes
-  Hostname pulse.madduck.net
+Host piper.madduck.net | piper
+  Hostname piper.madduck.net
 
 ### ARNOLD / GPLHOST
 
 Host arnold.madduck.net | arnold
-  ForwardAgent yes
   Hostname arnold.madduck.net
 Host arnold-host | arnold-host.madduck.net
   Hostname arnold-host.madduck.net
@@ -244,6 +235,15 @@ Host fishbowl | fishbowl.gern | fishbowl.lehel
   CanonicalizeMaxDots 0
   CanonicalDomains gern.madduck.net lehel.madduck.net rw.madduck.net
 
+### LOCAL VIRT HOSTS
+
+Host *.virt
+  CheckHostIP no
+  ForwardAgent yes
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+  ControlMaster no
+
 ### DEBIAN
 
 Host scm.alioth.debian.org