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

diff --git a/.ssh/config.in b/.ssh/config.in
index c30ca37..146f9c0 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
@@ -210,6 +203,15 @@ Host albatross.lehel.madduck.net | albatross.lehel | albatross
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias albatross.lehel
+Host albatross-luks
+  Hostname albatross.lehel.madduck.net
+  HostKeyAlias albatross-luks.lehel.madduck.net
+  User root
+
+Host jugband.lehel.madduck.net | jugband.lehel | jugband
+  Hostname jugband.lehel.madduck.net
+  ForwardX11 yes
+  HostKeyAlias jugband.lehel
 
 ### GAUTING
 
@@ -266,17 +268,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
 
@@ -363,6 +368,6 @@ Host *
   Protocol 2
   ServerAliveInterval 45
   StrictHostKeyChecking yes
-  UpdateHostKeys ask
+  UpdateHostKeys no
   VerifyHostKeyDNS ask
   VisualHostKey no