]> 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:

add khyber-vnc shortcutt
[etc/ssh.git] / .ssh / config.in
index 4bb28e0dfbf925412b98de1cdc7838d78e54a64e..6e7eacc66d7acd691a0104aaa15804e5973442ee 100644 (file)
@@ -35,6 +35,10 @@ Host backup.madduck.net | backup
 Host khyber.madduck.net | khyber
   ForwardAgent yes
   Hostname khyber.madduck.net
 Host khyber.madduck.net | khyber
   ForwardAgent yes
   Hostname khyber.madduck.net
+Host khyber-vnc
+  ControlMaster no
+  ControlPath none
+  Hostname khyber.madduck.net
 
 Host wots.madduck.net | wots
   ForwardAgent yes
 
 Host wots.madduck.net | wots
   ForwardAgent yes
@@ -73,7 +77,7 @@ Host domine.madduck.net | domine
   Hostname domine.madduck.net
 
 Host irc
   Hostname domine.madduck.net
 
 Host irc
-  Hostname bell.madduck.net
+  Hostname vera.madduck.net
 
 Host martin-krafft.net
   User madduck
 
 Host martin-krafft.net
   User madduck
@@ -84,6 +88,8 @@ Host phd.martin-krafft.net
 Host madduck.net
   User madduck
   HostKeyAlias seamus.madduck.net
 Host madduck.net
   User madduck
   HostKeyAlias seamus.madduck.net
+Host imap.madduck.net
+  HostKeyAlias seamus.madduck.net
 
 Host bell.madduck.net | bell
   ForwardAgent yes
 
 Host bell.madduck.net | bell
   ForwardAgent yes
@@ -94,6 +100,14 @@ Host tunes.madduck.net | tunes
   Hostname tunes.madduck.net
   HostKeyAlias bell.madduck.net
 
   Hostname tunes.madduck.net
   HostKeyAlias bell.madduck.net
 
+Host diamond.madduck.net | diamond
+  ForwardAgent yes
+  Hostname diamond.madduck.net
+
+Host shelter.madduck.net | shelter
+  ForwardAgent yes
+  Hostname shelter.madduck.net
+
 Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
   Hostname sheep.umverkehr.ch
   User madduck
 Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
   Hostname sheep.umverkehr.ch
   User madduck
@@ -113,8 +127,8 @@ Host wall.oerlikon.madduck.net | wall
   ForwardAgent yes
   Hostname wall.oerlikon.madduck.net
 
   ForwardAgent yes
   Hostname wall.oerlikon.madduck.net
 
-Host vizier.oerlikon.madduck.net | vizier
-  Hostname vizier.oerlikon.madduck.net
+Host julia.oerlikon.madduck.net | julia
+  Hostname julia.oerlikon.madduck.net
   ForwardAgent yes
 
 Host embryo.gauting.madduck.net | embryo
   ForwardAgent yes
 
 Host embryo.gauting.madduck.net | embryo
@@ -127,7 +141,6 @@ Host piper.oerlikon.madduck.net | piper
   Hostname piper.oerlikon.madduck.net
   ForwardAgent yes
   ForwardX11 yes
   Hostname piper.oerlikon.madduck.net
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
 Host pipere
   Hostname wall.oerlikon.madduck.net
   Port 22223
 Host pipere
   Hostname wall.oerlikon.madduck.net
   Port 22223
@@ -136,18 +149,17 @@ Host pipere
   ForwardX11 yes
   HostKeyAlias piper.oerlikon.madduck.net
 
   ForwardX11 yes
   HostKeyAlias piper.oerlikon.madduck.net
 
-Host diamond.oerlikon.madduck.net | diamond
-  Hostname diamond.oerlikon.madduck.net
+Host albatross.oerlikon.madduck.net | albatross
+  Hostname albatross.oerlikon.madduck.net
   ForwardAgent yes
   ForwardX11 yes
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
-Host diamonde
+Host albatrosse
   Hostname wall.oerlikon.madduck.net
   Hostname wall.oerlikon.madduck.net
-  Port 22224
+  Port 22223
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias diamond.oerlikon.madduck.net
+  HostKeyAlias albatross.oerlikon.madduck.net
 
 Host pict.oerlikon.madduck.net | pict
   Hostname pict.oerlikon.madduck.net
 
 Host pict.oerlikon.madduck.net | pict
   Hostname pict.oerlikon.madduck.net
@@ -412,6 +424,9 @@ Host sergei.ifi.uzh.ch | sergei
 Host nikolai.ifi.uzh.ch | nikolai
   Hostname nikolai.ifi.uzh.ch
   User krafft
 Host nikolai.ifi.uzh.ch | nikolai
   Hostname nikolai.ifi.uzh.ch
   User krafft
+Host franz.ifi.uzh.ch | franz
+  Hostname franz.ifi.uzh.ch
+  User krafft
 
 Host clegg-host | clegg-host.madduck.net | gratis2.opro.ch | opro
   Hostname clegg-host.madduck.net
 
 Host clegg-host | clegg-host.madduck.net | gratis2.opro.ch | opro
   Hostname clegg-host.madduck.net
@@ -421,6 +436,9 @@ Host skynet.skynet.ie | skynet.ie | skynet
   Hostname skynet.skynet.ie
   User madduck
 
   Hostname skynet.skynet.ie
   User madduck
 
+Host aika.krafftwerk.de | aika
+  Hostname aika.krafftwerk.de
+
 Host *
 # AddressFamily any
 # BatchMode no
 Host *
 # AddressFamily any
 # BatchMode no
@@ -434,6 +452,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
+  ControlPersist 5
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no