]> git.madduck.net Git - etc/ssh.git/blobdiff - .ssh/config.in

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

new hostkey for pict
[etc/ssh.git] / .ssh / config.in
index 67ff7e7578f3cba7146fe9ecef48dcb13ab71175..892e519fdc0bb3ac0174c050bf150a3b0787203a 100644 (file)
@@ -90,12 +90,7 @@ Host madduck.net
   User madduck
   HostKeyAlias seamus.madduck.net
 Host imap.madduck.net
-  HostKeyAlias seamus.madduck.net
-
-Host diamond.madduck.net | diamond
-  ForwardAgent yes
-<<<<<<< HEAD
-  Hostname bell.madduck.net
+  HostKeyAlias domine.madduck.net
 
 Host diamond.madduck.net | diamond
   ForwardAgent yes
@@ -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