update for pennys home network

[etc/ssh.git] / .ssh / config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 00059f36fba3c0324938406dc34c1d980293f071..63107ede40375f4656479d4cda4913ad5b327992 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -27,6 +27,18 @@ 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 martin-krafft.net
   User madduck
@@ -56,7 +68,10 @@ 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
@@ -96,11 +111,14 @@ 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 helena.home.mjollnir.org | helena
+  CheckHostIP no
+  Hostname 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
@@ -137,14 +155,14 @@ 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 malo.debian.org | malo
   Hostname malo.debian.org
   User madduck
@@ -160,9 +178,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 +190,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 +205,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 +217,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 +226,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 +262,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 +274,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 +316,35 @@ 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 cvs.debian.org
+  HostKeyAlias gluck.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
@@ -322,6 +357,10 @@ Host gratis2.opro.ch | opro
   Hostname 193.242.105.2
   User madduck
 
+Host skynet.skynet.ie | skynet.ie | skynet
+  Hostname skynet.skynet.ie
+  User madduck
+
 Host *
 # AddressFamily any
 # BatchMode no
@@ -379,4 +418,5 @@ Host *
 # UsePrivilegedPort no
 # UserKnownHostsFile ~/.ssh/known_hosts
 # VerifyHostKeyDNS no
+  VisualHostKey no
 # XAuthLocation /usr/X11R6/bin/xauth