move imap.madduck.net to domine

[etc/ssh.git] / .ssh / config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 181726d2cb2863fd888c314bae964a6129ee0daf..892e519fdc0bb3ac0174c050bf150a3b0787203a 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -90,24 +90,26 @@ Host madduck.net
   User madduck
   HostKeyAlias seamus.madduck.net
 Host imap.madduck.net
-  HostKeyAlias seamus.madduck.net
+  HostKeyAlias domine.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
   Hostname tunes.madduck.net
   HostKeyAlias diamond.madduck.net
+  IPQoS lowdelay af13
 Host flics.madduck.net | flics
   AddressFamily inet
   ControlMaster no
   Hostname flics.madduck.net
   HostKeyAlias diamond.madduck.net
-Host scratch.madduck.net | scratch
-  User madduck
-  HostKeyAlias diamond.madduck.net
+  IPQoS lowdelay af13
 
 Host shelter.madduck.net | shelter
   ForwardAgent yes
@@ -135,6 +137,17 @@ 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 galaxy-s2.phones.gern | galaxy-s2
+  Hostname galaxy-s2.phones.gern
+  User root
 
 Host embryo.gauting.madduck.net | embryo
   CheckHostIP no
@@ -146,13 +159,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 +166,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
@@ -172,19 +178,13 @@ Host pict.gern.madduck.net | pict
   ForwardX11 yes
 #  AddressFamily inet
 
-Host nokia-n900.gern.madduck.net | nokia-n900 | n900
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  User user
-
 Host auge-fr.no-ip.org | auge
   CheckHostIP no
   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
@@ -413,6 +413,7 @@ Host *
   HostKeyAlgorithms ssh-rsa
 # IdentityFile ~/.ssh/identity
   IdentityFile2 ~/.ssh/id_rsa
+  IPQoS lowdelay throughput
 # KbdInteractiveDevices pam
 # LocalCommand none
 # LocalForward none