X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/9a8d342f1e31da934d02d4e16784e8aa6119093a..d928112c0b82e9e35a0eec48efd5b433e08b7dde:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index c0bed14..6754c31 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -7,16 +7,30 @@ Host 127.0.0.1 | localhost
 Host pulse.madduck.net | pulse
   ForwardAgent yes
   Hostname pulse.madduck.net
+  #AddressFamily inet
 Host svn.madduck.net | svn
   User madduck
   HostKeyAlias pulse.madduck.net
 Host git.madduck.net | git
   User madduck
   HostKeyAlias pulse.madduck.net
+  #AddressFamily inet
 Host scratch.madduck.net | scratch
   User madduck
   HostKeyAlias pulse.madduck.net
+  #AddressFamily inet
+Host debian.madduck.net | debian
+  User madduck
+  HostKeyAlias pulse.madduck.net
+  #AddressFamily inet
+Host openvpn.madduck.net | openvpn
+  User madduck
+  HostKeyAlias pulse.madduck.net
+  #AddressFamily inet
 
+Host martin-krafft.net
+  User madduck
+  HostKeyAlias seamus.madduck.net
 Host phd.martin-krafft.net
   User madduck
   HostKeyAlias seamus.madduck.net
@@ -24,14 +38,93 @@ Host madduck.net
   User madduck
   HostKeyAlias seamus.madduck.net
 
-Host lapse.madduck.net | lapse.oerlikon.madduck.net | lapse
+Host tunes.madduck.net | tunes
+  Hostname bell.madduck.net
+  HostKeyAlias bell.madduck.net
+
+Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
+  Hostname sheep.umverkehr.ch
+  User madduck
+
+Host lapse.rw.madduck.net | lapse.oerlikon.madduck.net | lapse
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+#  AddressFamily inet
+
+Host wall.oerlikon.madduck.net | wall
+  CheckHostIP no
+  ForwardAgent yes
+  Hostname wall.oerlikon.madduck.net
+  HostKeyAlias wall.oerlikon.madduck.net
+
+Host embryo.gauting.madduck.net | embryo
+  CheckHostIP no
+  ForwardAgent yes
+  Hostname embryo.gauting.madduck.net
+  HostKeyAlias embryo.gauting.madduck.net
+
+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 wall.madduck.net | wall.oerlikon.madduck.net | oerlikon.no-up.org | wall
+Host pict.oerlikon.madduck.net | pict
+  Hostname pict.oerlikon.madduck.net
+  ForwardAgent yes
+  ForwardX11 yes
+#  AddressFamily inet
+
+Host lust.oerlikon.madduck.net | lust | hermia
+  Hostname rscguest.ex.ulcc.ac.uk
+  AddressFamily inet
+  HostKeyAlias hermia.mjollnir.org
   CheckHostIP no
 
-Host embryo.madduck.net | embryo.gauting.madduck.net | gauting.no-ip.org | embryo
+Host mother.gauting.madduck.net | mother
+  Hostname mother.gauting.madduck.net
+  ForwardAgent yes
+  ForwardX11 yes
+Host mothere
+  Hostname embryo.madduck.net
+  Port 22221
   CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias mother.gauting.madduck.net
+
+Host brick.gauting.madduck.net | brick
+  Hostname brick.gauting.madduck.net
+  ForwardAgent yes
+  ForwardX11 yes
+Host bricke
+  Hostname embryo.madduck.net
+  Port 22222
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias brick.gauting.madduck.net
 
 Host debian-community.org | bikeshed.debian-community.org | bikeshed
   Hostname bikeshed.debian-community.org
@@ -217,6 +310,20 @@ Host argento.debian.org | argento
 Host allegri.debian.org | allegri
   Hostname allegri.debian.org
   User madduck
+Host ravel.debian.org | ravel
+  Hostname ravel.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 gratis2.opro.ch | opro
+  Hostname 193.242.105.2
+  User madduck
 
 Host *
 # AddressFamily any
@@ -265,7 +372,7 @@ Host *
 # RhostsRSAAuthentication no
 # RSAAuthentication no
 # ServerAliveCountMax 3
-# ServerAliveInterval 45
+  ServerAliveInterval 45
   SetupTimeOut 10
 # SmartcardDevice off
   StrictHostKeyChecking yes
@@ -275,4 +382,5 @@ Host *
 # UsePrivilegedPort no
 # UserKnownHostsFile ~/.ssh/known_hosts
 # VerifyHostKeyDNS no
+  VisualHostKey yes
 # XAuthLocation /usr/X11R6/bin/xauth