X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/f285db605bb9cc1afa7a164160aa90de1b892619..117ce2736e9f627f70d0f416603232b102571f17:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index a3638b0..3e0b44d 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -16,15 +16,63 @@ Host git.madduck.net | git
 Host scratch.madduck.net | scratch
   User madduck
   HostKeyAlias pulse.madduck.net
+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
+Host madduck.net
+  User madduck
+  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
   CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+#  AddressFamily inet
 
 Host wall.madduck.net | wall.oerlikon.madduck.net | oerlikon.no-up.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 2222
+  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 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
@@ -211,6 +259,13 @@ Host allegri.debian.org | allegri
   Hostname allegri.debian.org
   User madduck
 
+Host sergei.ifi.uzh.ch | sergei
+  Hostname sergei.ifi.uzh.ch
+  User krafft
+Host nikolai.ifi.uzh.ch | nikolai
+  Hostname nikolai.ifi.uzh.ch
+  User krafft
+
 Host *
 # AddressFamily any
 # BatchMode no
@@ -258,7 +313,7 @@ Host *
 # RhostsRSAAuthentication no
 # RSAAuthentication no
 # ServerAliveCountMax 3
-# ServerAliveInterval 45
+  ServerAliveInterval 45
   SetupTimeOut 10
 # SmartcardDevice off
   StrictHostKeyChecking yes