X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/737be01383f278adaa06ed667e676633bfd6ad7e..223d198cef03f7df3e94bb31ecf5836f1db661f5:/.ssh/config.in?ds=sidebyside

diff --git a/.ssh/config.in b/.ssh/config.in
index 00059f3..f126667 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,6 +23,54 @@ 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 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 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 bell.madduck.net
 
 Host martin-krafft.net
   User madduck
@@ -38,8 +82,13 @@ Host madduck.net
   User madduck
   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 sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
@@ -50,13 +99,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 vizier.oerlikon.madduck.net | vizier
+  Hostname vizier.oerlikon.madduck.net
+  ForwardAgent yes
 
 Host embryo.gauting.madduck.net | embryo
   CheckHostIP no
@@ -70,7 +126,7 @@ Host piper.oerlikon.madduck.net | piper
   ForwardX11 yes
 #  AddressFamily inet
 Host pipere
-  Hostname wall.madduck.net
+  Hostname wall.oerlikon.madduck.net
   Port 22223
   CheckHostIP no
   ForwardAgent yes
@@ -83,7 +139,7 @@ Host diamond.oerlikon.madduck.net | diamond
   ForwardX11 yes
 #  AddressFamily inet
 Host diamonde
-  Hostname wall.madduck.net
+  Hostname wall.oerlikon.madduck.net
   Port 22224
   CheckHostIP no
   ForwardAgent yes
@@ -96,18 +152,28 @@ 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 hermia.home.mjollnir.org | hermia | lust.oerlikon.madduck.net | lust
+  CheckHostIP no
+  ForwardX11 yes
+  HostKeyAlias hermia.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
@@ -119,13 +185,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
@@ -137,14 +207,17 @@ Host alioth.debian.org | alioth
   User madduck
 Host svn.debian.org
   HostKeyAlias alioth.debian.org
+  User madduck
 Host git.debian.org
   HostKeyAlias alioth.debian.org
+  User madduck
 Host hg.debian.org
   HostKeyAlias alioth.debian.org
-
-Host vore.debian.org | vore
-  Hostname vore.debian.org
   User madduck
+Host cvs.debian.org
+  HostKeyAlias alioth.debian.org
+  User madduck
+
 Host malo.debian.org | malo
   Hostname malo.debian.org
   User madduck
@@ -160,9 +233,6 @@ Host saens.debian.org | saens
 Host spohr.debian.org | spohr
   Hostname spohr.debian.org
   User madduck
-Host auric.debian.org | auric
-  Hostname auric.debian.org
-  User madduck
 Host gluck.debian.org | gluck
   Hostname gluck.debian.org
   User madduck
@@ -175,12 +245,6 @@ Host sarti.debian.org | sarti
 Host europa.debian.org | europa
   Hostname europa.debian.org
   User madduck
-Host goedel.debian.org | goedel
-  Hostname goedel.debian.org
-  User madduck
-Host casals.debian.org | casals
-  Hostname casals.debian.org
-  User madduck
 Host master.debian.org | master
   Hostname master.debian.org
   User madduck
@@ -196,9 +260,6 @@ Host merkel.debian.org | merkel
 Host murphy.debian.org | murphy
   Hostname murphy.debian.org
   User madduck
-Host escher.debian.org | escher
-  Hostname escher.debian.org
-  User madduck
 Host raptor.debian.org | raptor
   Hostname raptor.debian.org
   User madduck
@@ -211,9 +272,6 @@ Host raff.debian.org | raff
 Host klecker.debian.org | klecker
   Hostname klecker.debian.org
   User madduck
-Host vaughan.debian.org | vaughan
-  Hostname vaughan.debian.org
-  User madduck
 Host voltaire.debian.org | voltaire
   Hostname voltaire.debian.org
   User madduck
@@ -223,9 +281,6 @@ Host bruckner.debian.org | bruckner
 Host kullervo.debian.org | kullervo
   Hostname kullervo.debian.org
   User madduck
-Host kullervo.debian.org | kullervo
-  Hostname kullervo.debian.org
-  User madduck
 Host samosa.debian.org | samosa
   Hostname samosa.debian.org
   User madduck
@@ -262,6 +317,9 @@ Host peri.debian.org | peri
 Host lobos.debian.org | lobos
   Hostname lobos.debian.org
   User madduck
+Host wagner.debian.org | wagner
+  Hostname wagner.debian.org
+  User madduck
 Host verdi.debian.org | verdi
   Hostname verdi.debian.org
   User madduck
@@ -271,6 +329,9 @@ Host ries.debian.org | ries
 Host goetz.debian.org | goetz
   Hostname goetz.debian.org
   User madduck
+Host ravel.debian.org | ravel
+  Hostname ravel.debian.org
+  User madduck
 Host rietz.debian.org | rietz
   Hostname rietz.debian.org
   User madduck
@@ -310,6 +371,37 @@ Host argento.debian.org | argento
 Host allegri.debian.org | allegri
   Hostname allegri.debian.org
   User madduck
+Host morales.debian.org | morales
+  Hostname morales.debian.org
+  User madduck
+Host auber.debian.org | auber
+  Hostname auber.debian.org
+  User madduck
+Host mahler.debian.org | mahler
+  Hostname mahler.debian.org
+  User madduck
+Host schroeder.debian.org | schroeder
+  Hostname schroeder.debian.org
+  User madduck
+Host powell.debian.org | powell
+  Hostname powell.debian.org
+  User madduck
+Host rem.debian.org | rem
+  Hostname rem.debian.org
+  User madduck
+Host smetana.debian.org | smetana
+  Hostname smetana.debian.org
+  User madduck
+Host strauss.debian.net | strauss
+  Hostname strauss.debian.net
+  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
@@ -318,8 +410,12 @@ Host nikolai.ifi.uzh.ch | nikolai
   Hostname nikolai.ifi.uzh.ch
   User krafft
 
-Host gratis2.opro.ch | opro
-  Hostname 193.242.105.2
+Host clegg-host | clegg-host.madduck.net | gratis2.opro.ch | opro
+  Hostname clegg-host.madduck.net
+  User madduck
+
+Host skynet.skynet.ie | skynet.ie | skynet
+  Hostname skynet.skynet.ie
   User madduck
 
 Host *
@@ -379,4 +475,5 @@ Host *
 # UsePrivilegedPort no
 # UserKnownHostsFile ~/.ssh/known_hosts
 # VerifyHostKeyDNS no
+  VisualHostKey no
 # XAuthLocation /usr/X11R6/bin/xauth