X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/27b530cf488c5cf193e28f83acf9c7c0bf452344..dc07e6c5c6245f67b1add9b5eb3596f01e41968b:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 181726d..67ff7e7 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -92,9 +92,17 @@ Host madduck.net
 Host imap.madduck.net
   HostKeyAlias seamus.madduck.net
 
+Host diamond.madduck.net | diamond
+  ForwardAgent yes
+<<<<<<< HEAD
+  Hostname bell.madduck.net
+
 Host diamond.madduck.net | diamond
   ForwardAgent yes
   Hostname diamond.madduck.net
+Host scratch.madduck.net | scratch
+  User madduck
+  HostKeyAlias diamond.madduck.net
 Host tunes.madduck.net | tunes
   AddressFamily inet
   ControlMaster no
@@ -105,9 +113,6 @@ Host flics.madduck.net | flics
   ControlMaster no
   Hostname flics.madduck.net
   HostKeyAlias diamond.madduck.net
-Host scratch.madduck.net | scratch
-  User madduck
-  HostKeyAlias diamond.madduck.net
 
 Host shelter.madduck.net | shelter
   ForwardAgent yes
@@ -135,6 +140,13 @@ Host wall.gern.madduck.net | wall
 Host julia.gern.madduck.net | julia
   Hostname julia.gern.madduck.net
   ForwardAgent yes
+Host juliae
+  Hostname wall.gern.madduck.net
+  Port 22002
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias julia.gern.madduck.net
 
 Host embryo.gauting.madduck.net | embryo
   CheckHostIP no
@@ -146,13 +158,6 @@ Host piper.gern.madduck.net | piper
   Hostname piper.gern.madduck.net
   ForwardAgent yes
   ForwardX11 yes
-Host pipere
-  Hostname wall.gern.madduck.net
-  Port 22223
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias piper.gern.madduck.net
 
 Host albatross.gern.madduck.net | albatross
   Hostname albatross.gern.madduck.net
@@ -160,7 +165,7 @@ Host albatross.gern.madduck.net | albatross
   ForwardX11 yes
 Host albatrosse
   Hostname wall.gern.madduck.net
-  Port 22222
+  Port 22032
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
@@ -183,8 +188,8 @@ Host auge-fr.no-ip.org | auge
   Hostname auge-fr.no-ip.org
   HostKeyAlias helena.home.mjollnir.org
 
-Host mother.gauting.madduck.net | mother
-  Hostname mother.gauting.madduck.net
+Host mother.gauting | mother | mother.gauting.madduck.net
+  Hostname mother.gauting
   ForwardAgent yes
   ForwardX11 yes
 Host mothere