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

diff --git a/.ssh/config.in b/.ssh/config.in
index 67ff7e7..b73916d 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -92,11 +92,6 @@ 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
@@ -108,11 +103,13 @@ Host tunes.madduck.net | tunes
   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
+  IPQoS lowdelay af13
 
 Host shelter.madduck.net | shelter
   ForwardAgent yes
@@ -148,6 +145,10 @@ Host juliae
   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
   ForwardAgent yes
@@ -177,12 +178,6 @@ 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
@@ -418,6 +413,7 @@ Host *
   HostKeyAlgorithms ssh-rsa
 # IdentityFile ~/.ssh/identity
   IdentityFile2 ~/.ssh/id_rsa
+  IPQoS lowdelay throughput
 # KbdInteractiveDevices pam
 # LocalCommand none
 # LocalForward none