X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/b25943bc86dd63f715660156bec7c441c4d38dff..4c5fcbae413b04614114cc033ce832ed9ae416b0:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 44f5a27..792cf4d 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
@@ -31,28 +39,51 @@ 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
+  HostKeyAlias wall.oerlikon.madduck.net
 
-Host embryo.madduck.net | embryo.gauting.madduck.net | gauting.no-ip.org | embryo
+Host embryo.gauting.madduck.net | gauting.no-ip.org | embryo
   CheckHostIP no
   ForwardAgent yes
+  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 pict.oerlikon.madduck.net | pict
   Hostname pict.oerlikon.madduck.net
@@ -60,6 +91,30 @@ Host pict.oerlikon.madduck.net | pict
   ForwardX11 yes
 #  AddressFamily inet
 
+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
@@ -299,7 +354,7 @@ Host *
 # RhostsRSAAuthentication no
 # RSAAuthentication no
 # ServerAliveCountMax 3
-# ServerAliveInterval 45
+  ServerAliveInterval 45
   SetupTimeOut 10
 # SmartcardDevice off
   StrictHostKeyChecking yes