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

diff --git a/.ssh/config.in b/.ssh/config.in
index 831ff70..71a6184 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
@@ -235,7 +226,7 @@ Host atom.mtvic.madduck.net | atom.mtvic | atom
 
 ### ROAD WARRIORS
 
-Host fishbowl | fishbowl.gern | fishbowl.lehel
+Host fishbowl | fishbowl.gern | fishbowl.lehel | fishbowl.rw.madduck.net
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
@@ -244,6 +235,20 @@ Host fishbowl | fishbowl.gern | fishbowl.lehel
   CanonicalizeMaxDots 0
   CanonicalDomains gern.madduck.net lehel.madduck.net rw.madduck.net
 
+### LOCAL VIRT HOSTS
+
+Host *.virt | 192.168.122.* | red | green | blue | yellow | black | white | orange | violet
+  CheckHostIP no
+  ForwardAgent yes
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+  ControlMaster no
+  User root
+  CanonicalDomains virt
+  CanonicalizeHostname yes
+  CanonicalizeFallbackLocal no
+  CanonicalizeMaxDots 0
+
 ### DEBIAN
 
 Host scm.alioth.debian.org