X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/0b4cfb11d1aaf79a4966024c5accfb899fb1dd48..422c96ea5e7f0130fa41cabbcefeb47be68fe370:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 1e490df..92a46d6 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -11,10 +11,6 @@ Host pulse.madduck.net | pulse
 Host svn.madduck.net | svn
   User madduck
   HostKeyAlias pulse.madduck.net
-Host git.madduck.net | git
-  User madduck
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
 Host scratch.madduck.net | scratch
   User madduck
   HostKeyAlias pulse.madduck.net
@@ -27,10 +23,61 @@ Host openvpn.madduck.net | openvpn
   User madduck
   HostKeyAlias pulse.madduck.net
   #AddressFamily inet
+Host ssh443.madduck.net | ssh443
+  User madduck
+  HostKeyAlias pulse.madduck.net
+  ForwardAgent yes
+  Port 443
+Host backup.madduck.net | backup
+  HostKeyAlias pulse.madduck.net
+  #AddressFamily inet
 
 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
+  Hostname wots.madduck.net
+Host buildd.debian.madduck.net | buildd
+  HostKeyAlias wots.madduck.net
+
+Host lotus.madduck.net | lotus
+  ForwardAgent yes
+  Hostname lotus.madduck.net
+Host git.madduck.net | git
+  User git
+  HostKeyAlias lotus.madduck.net
+Host git.debian.ch
+  User git
+  HostKeyAlias lotus.madduck.net
+
+Host jugband.madduck.net | jugband
+  ForwardAgent yes
+  Hostname jugband.madduck.net
+
+Host vera.madduck.net | vera
+  ForwardAgent yes
+  Hostname vera.madduck.net
+
+Host swan-host | swan-host.madduck.net
+  Hostname swan-host.madduck.net
+  User krafft
+
+Host swan.madduck.net | swan
+  ForwardAgent yes
+  Hostname swan.madduck.net
+
+Host domine.madduck.net | domine
+  ForwardAgent yes
+  Hostname domine.madduck.net
+
+Host irc
+  Hostname vera.madduck.net
 
 Host martin-krafft.net
   User madduck
@@ -41,11 +88,26 @@ Host phd.martin-krafft.net
 Host madduck.net
   User madduck
   HostKeyAlias seamus.madduck.net
+Host imap.madduck.net
+  HostKeyAlias seamus.madduck.net
 
-Host tunes.madduck.net | tunes
+Host bell.madduck.net | bell
+  ForwardAgent yes
   Hostname bell.madduck.net
+Host tunes.madduck.net | tunes
+  AddressFamily inet
+  ControlMaster no
+  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
@@ -54,13 +116,20 @@ Host lapse.rw.madduck.net | lapse.oerlikon.madduck.net | lapse
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
+
+Host fishbowl.rw.madduck.net | fishbowl.oerlikon.madduck.net | fishbowl
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
 
 Host wall.oerlikon.madduck.net | wall
   CheckHostIP no
   ForwardAgent yes
   Hostname wall.oerlikon.madduck.net
-  HostKeyAlias wall.oerlikon.madduck.net
+
+Host julia.oerlikon.madduck.net | julia
+  Hostname julia.oerlikon.madduck.net
+  ForwardAgent yes
 
 Host embryo.gauting.madduck.net | embryo
   CheckHostIP no
@@ -72,27 +141,25 @@ Host piper.oerlikon.madduck.net | piper
   Hostname piper.oerlikon.madduck.net
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
 Host pipere
-  Hostname wall.madduck.net
+  Hostname wall.oerlikon.madduck.net
   Port 22223
   CheckHostIP no
   ForwardAgent yes
   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
-#  AddressFamily inet
-Host diamonde
-  Hostname wall.madduck.net
-  Port 22224
+Host albatrosse
+  Hostname wall.oerlikon.madduck.net
+  Port 22223
   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
@@ -100,18 +167,23 @@ Host pict.oerlikon.madduck.net | pict
   ForwardX11 yes
 #  AddressFamily inet
 
-Host lust.oerlikon.madduck.net | lust | hermia
-  Hostname rscguest.ex.ulcc.ac.uk
-  AddressFamily inet
-  HostKeyAlias hermia.mjollnir.org
+Host nokia-n900.oerlikon.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
   ForwardAgent yes
   ForwardX11 yes
 Host mothere
-  Hostname embryo.madduck.net
+  Hostname embryo.gauting.madduck.net
   Port 22221
   CheckHostIP no
   ForwardAgent yes
@@ -123,13 +195,17 @@ Host brick.gauting.madduck.net | brick
   ForwardAgent yes
   ForwardX11 yes
 Host bricke
-  Hostname embryo.madduck.net
+  Hostname embryo.gauting.madduck.net
   Port 22222
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias brick.gauting.madduck.net
 
+Host zlinli.no-ip.org | zlinli
+  CheckHostIP no
+  Hostname zlinli.no-ip.org
+
 Host debian-community.org | bikeshed.debian-community.org | bikeshed
   Hostname bikeshed.debian-community.org
   User madduck
@@ -148,6 +224,9 @@ Host git.debian.org
 Host hg.debian.org
   HostKeyAlias alioth.debian.org
   User madduck
+Host cvs.debian.org
+  HostKeyAlias alioth.debian.org
+  User madduck
 
 Host malo.debian.org | malo
   Hostname malo.debian.org
@@ -323,6 +402,13 @@ Host rem.debian.org | rem
 Host smetana.debian.org | smetana
   Hostname smetana.debian.org
   User madduck
+Host bellini.debian.org | bellini
+  Hostname bellini.debian.org
+  User madduck
+
+Host people.debian.org
+  HostKeyAlias ravel.debian.org
+  User madduck
 
 Host sergei.ifi.uzh.ch | sergei
   Hostname sergei.ifi.uzh.ch
@@ -330,11 +416,21 @@ Host sergei.ifi.uzh.ch | sergei
 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
+  User madduck
 
-Host gratis2.opro.ch | opro
-  Hostname 193.242.105.2
+Host skynet.skynet.ie | skynet.ie | skynet
+  Hostname skynet.skynet.ie
   User madduck
 
+Host aika.krafftwerk.de | aika
+  Hostname aika.krafftwerk.de
+
 Host *
 # AddressFamily any
 # BatchMode no
@@ -348,6 +444,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
+  ControlPersist 5
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no