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

diff --git a/.ssh/config.in b/.ssh/config.in
index 1d7ed01..f79455e 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 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 | oerlikon.no-ip.org | wall
+Host wall.oerlikon.madduck.net | wall
   CheckHostIP no
   ForwardAgent yes
-#  AddressFamily inet
+  Host 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
+  Host embryo.gauting.madduck.net
+  HostKeyAlias embryo.gauting.madduck.net
 
 Host piper.oerlikon.madduck.net | piper
   Hostname piper.oerlikon.madduck.net
@@ -81,6 +96,12 @@ 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
@@ -99,7 +120,7 @@ Host brick.gauting.madduck.net | brick
   ForwardX11 yes
 Host bricke
   Hostname embryo.madduck.net
-  Port 22221
+  Port 22222
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
@@ -297,6 +318,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