From: martin f. krafft <madduck@madduck.net>
Date: Mon, 16 Jun 2008 13:06:27 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh
X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/228c2836762031ee469e011850593b36012b45f9?hp=117ce2736e9f627f70d0f416603232b102571f17

Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh
---

diff --git a/.ssh/config.in b/.ssh/config.in
index 3e0b44d..79369b7 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -56,7 +56,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 +67,14 @@ 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