X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/c4e61eb11bb81f09afcf752961bdfe1533fc21ed..e856802f5203e61e65ea5f972626c98d72b120e9:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 3e0b44d..b6638b4 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -7,18 +7,26 @@ 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
@@ -34,20 +42,27 @@ Host tunes.madduck.net | tunes
   Hostname bell.madduck.net
   HostKeyAlias bell.madduck.net
 
-Host lapse.madduck.net | lapse.oerlikon.madduck.net | lapse
+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.madduck.net | wall.oerlikon.madduck.net | oerlikon.no-up.org | wall
+Host wall.oerlikon.madduck.net | wall
   CheckHostIP no
   ForwardAgent yes
-#  AddressFamily inet
+  Hostname wall.oerlikon.madduck.net
+  HostKeyAlias wall.oerlikon.madduck.net
 
-Host embryo.madduck.net | embryo.gauting.madduck.net | gauting.no-ip.org | embryo
+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
@@ -56,7 +71,7 @@ Host piper.oerlikon.madduck.net | piper
 #  AddressFamily inet
 Host pipere
   Hostname wall.madduck.net
-  Port 2222
+  Port 22223
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
@@ -67,6 +82,13 @@ Host diamond.oerlikon.madduck.net | diamond
   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
@@ -74,6 +96,36 @@ Host pict.oerlikon.madduck.net | pict
   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 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
   User madduck
@@ -258,6 +310,9 @@ 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
@@ -266,6 +321,10 @@ 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
 # BatchMode no
@@ -323,4 +382,5 @@ Host *
 # UsePrivilegedPort no
 # UserKnownHostsFile ~/.ssh/known_hosts
 # VerifyHostKeyDNS no
+  VisualHostKey no
 # XAuthLocation /usr/X11R6/bin/xauth