X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/297e2729643d80c8af7c0435f6bfe4bab8af3364..0caca36057b796df2d0b0d43139347c59de861bd:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index bcdaa3b..3a309da 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -87,19 +87,12 @@ Host madduck.net
   User madduck
   HostKeyAlias lotus.madduck.net
 
-Host jugband.madduck.net | jugband
-  ForwardAgent yes
-  Hostname jugband.madduck.net
-
 Host domine.madduck.net | domine
   ForwardAgent yes
   Hostname domine.madduck.net
 Host imap.madduck.net
   HostKeyAlias domine.madduck.net
 
-Host aika.krafftwerk.de | aika
-  Hostname aika.krafftwerk.de
-
 Host sysyphus.madduck.net | sysyphus
   ForwardAgent yes
   Hostname sysyphus.madduck.net
@@ -266,17 +259,20 @@ Host fishbowl | fishbowl.rw.madduck.net
 
 ### LOCAL VIRT HOSTS
 
+Host wafer.virt
+  RemoteForward 25000 localhost:25
+  ForwardX11 yes
+
 Host red | green | blue | yellow | black | white | orange | violet | wafer
+  CanonicalDomains virt
+  CanonicalizeHostname yes
+  CanonicalizeFallbackLocal no
+  CanonicalizeMaxDots 0
   VerifyHostKeyDNS no
   CheckHostIP no
   ForwardAgent yes
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
-  ControlMaster no
-  CanonicalDomains virt
-  CanonicalizeHostname yes
-  CanonicalizeFallbackLocal no
-  CanonicalizeMaxDots 0
 
 ### DEBIAN