X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/928b301276e2429897f1aa4d73c06c93ec796e51..b6a8c5a89e452e182b86e6d0c8e17161bd9861cb:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 722d8f8..9b7e43f 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -20,6 +20,9 @@ Host debian.madduck.net | debian
   User madduck
   HostKeyAlias pulse.madduck.net
 
+Host martin-krafft.net
+  User madduck
+  HostKeyAlias seamus.madduck.net
 Host phd.martin-krafft.net
   User madduck
   HostKeyAlias seamus.madduck.net
@@ -28,16 +31,56 @@ Host madduck.net
   HostKeyAlias seamus.madduck.net
 
 Host tunes.madduck.net | tunes
+  Hostname bell.madduck.net
   HostKeyAlias bell.madduck.net
 
-Host lapse.madduck.net | lapse.oerlikon.madduck.net | lapse
+Host lapse.rw.madduck.net | lapse.oerlikon.madduck.net | lapse
   CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+#  AddressFamily inet
 
-Host wall.madduck.net | wall.oerlikon.madduck.net | oerlikon.no-up.org | wall
+Host wall.oerlikon.madduck.net | oerlikon.no-ip.org | wall
   CheckHostIP no
+  ForwardAgent yes
+#  AddressFamily inet
 
 Host embryo.madduck.net | embryo.gauting.madduck.net | gauting.no-ip.org | embryo
   CheckHostIP no
+  ForwardAgent yes
+
+Host piper.oerlikon.madduck.net | piper
+  Hostname piper.oerlikon.madduck.net
+  ForwardAgent yes
+  ForwardX11 yes
+#  AddressFamily inet
+Host pipere
+  Hostname wall.madduck.net
+  Port 22223
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias piper.oerlikon.madduck.net
+
+Host diamond.oerlikon.madduck.net | diamond
+  Hostname diamond.oerlikon.madduck.net
+  ForwardAgent yes
+  ForwardX11 yes
+#  AddressFamily inet
+Host diamonde
+  Hostname wall.madduck.net
+  Port 22224
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias diamond.oerlikon.madduck.net
+
+
+Host pict.oerlikon.madduck.net | pict
+  Hostname pict.oerlikon.madduck.net
+  ForwardAgent yes
+  ForwardX11 yes
+#  AddressFamily inet
 
 Host debian-community.org | bikeshed.debian-community.org | bikeshed
   Hostname bikeshed.debian-community.org
@@ -278,7 +321,7 @@ Host *
 # RhostsRSAAuthentication no
 # RSAAuthentication no
 # ServerAliveCountMax 3
-# ServerAliveInterval 45
+  ServerAliveInterval 45
   SetupTimeOut 10
 # SmartcardDevice off
   StrictHostKeyChecking yes