]> git.madduck.net Git - etc/ssh.git/commitdiff

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:

Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh
authormartin f. krafft <madduck@madduck.net>
Mon, 17 Feb 2014 20:33:45 +0000 (21:33 +0100)
committermartin f. krafft <madduck@madduck.net>
Mon, 17 Feb 2014 20:33:45 +0000 (21:33 +0100)
1  2 
.ssh/config.in

diff --combined .ssh/config.in
index eda5d9c1101a472b3308a22ff5ded7b3bb916f1f,049362dfbb0fa8ecb2c8e4ec07c066f9565f355d..0925cb3922d72af55274c46998bc71b402cfb9ce
@@@ -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