From: martin f. krafft <madduck@madduck.net>
Date: Mon, 17 Feb 2014 20:33:45 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh
X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/4a00cd9a85291b97ba4e5ddf985a9904efdf5546?hp=-c

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

4a00cd9a85291b97ba4e5ddf985a9904efdf5546
diff --combined .ssh/config.in
index eda5d9c,049362d..0925cb3
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@@ -134,7 -134,7 +134,7 @@@ Host swan.madduck.net | swa
    Hostname swan.madduck.net
  
  ### ARNOLD / GPLHOST
- #
+ 
  Host arnold-host | arnold-host.madduck.net
    Hostname arnold-host.madduck.net
    User xen05
@@@ -157,17 -157,10 +157,10 @@@ Host julia
    ForwardX11 yes
    HostKeyAlias julia.gern.madduck.net
  
- Host albatross.lehel.madduck.net | albatross
-   Hostname albatross.lehel.madduck.net
-   ForwardAgent yes
-   ForwardX11 yes
- Host albatrosse
-   Hostname wall.gern.madduck.net
-   Port 22032
-   CheckHostIP no
+ Host fishbowl.gern.madduck.net | fishbowl.gern
    ForwardAgent yes
    ForwardX11 yes
-   HostKeyAlias albatross.lehel.madduck.net
+   HostKeyAlias fishbowl.gern
  
  Host galaxy-s2.phones.gern | galaxy-s2
    Hostname galaxy-s2.phones.gern
@@@ -190,6 -183,24 +183,24 @@@ Host clegg.lehel.madduck.net | cleg
    ForwardAgent yes
    Hostname clegg.lehel.madduck.net
  
+ Host albatross.lehel.madduck.net | albatross.lehel | albatross
+   Hostname albatross.lehel.madduck.net
+   ForwardAgent yes
+   ForwardX11 yes
+   HostKeyAlias albatross.lehel
+ Host albatrosse
+   Hostname wall.lehel.madduck.net
+   Port 22032
+   CheckHostIP no
+   ForwardAgent yes
+   ForwardX11 yes
+   HostKeyAlias albatross.lehel
+ 
+ Host fishbowl.lehel.madduck.net | fishbowl.lehel
+   ForwardAgent yes
+   ForwardX11 yes
+   HostKeyAlias fishbowl.lehel
+ 
  ### GAUTING
  
  Host embryo.gauting.madduck.net | embryo
@@@ -204,7 -215,7 +215,7 @@@ Host mother.gauting | mother | mother.g
    ForwardX11 yes
  Host mothere
    Hostname embryo.gauting.madduck.net
 -  Port 22221
 +  Port 22021
    CheckHostIP no
    ForwardAgent yes
    ForwardX11 yes
@@@ -224,21 -235,13 +235,16 @@@ Host brick
  
  ### ROAD WARRIORS
  
- Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse
-   CheckHostIP no
-   ForwardAgent yes
-   ForwardX11 yes
- 
- Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
+ Host fishbowl
    CheckHostIP no
    ForwardAgent yes
    ForwardX11 yes
  
  ### DEBIAN
  
 +Host scm.alioth.debian.org
 +  HostKeyAlias wagner.debian.org
 +  User madduck
  Host svn.debian.org
    HostKeyAlias vasks.debian.org
    User madduck