X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/2fd6dbc5649ea33262a17a1d4ce81133df234c1e..6e8c08f09d7fd11ee3c11b33f9180f5f7031c0bf:/.ssh/config.in?ds=sidebyside

diff --git a/.ssh/config.in b/.ssh/config.in
index 40aa48f..369f33a 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -32,12 +32,26 @@ Host ssh443.madduck.net | ssh443
   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 lotus.madduck.net | lotus
+  ForwardAgent yes
+  Hostname lotus.madduck.net
+
+Host jugband.madduck.net | jugband
+  ForwardAgent yes
+  Hostname jugband.madduck.net
+
 Host martin-krafft.net
   User madduck
   HostKeyAlias seamus.madduck.net
@@ -49,7 +63,9 @@ Host madduck.net
   HostKeyAlias seamus.madduck.net
 
 Host tunes.madduck.net | tunes
-  Hostname bell.madduck.net
+  AddressFamily inet
+  ControlMaster no
+  Hostname tunes.madduck.net
   HostKeyAlias bell.madduck.net
 
 Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
@@ -66,7 +82,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
@@ -80,7 +99,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
@@ -93,7 +112,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
@@ -106,18 +125,22 @@ Host pict.oerlikon.madduck.net | pict
   ForwardX11 yes
 #  AddressFamily inet
 
-Host lust.oerlikon.madduck.net | lust | hermia
-  AddressFamily inet
-  HostKeyAlias hermia.mjollnir.org
-  ForwardX11 yes
+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
@@ -129,13 +152,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
@@ -154,6 +181,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
@@ -329,9 +359,11 @@ Host rem.debian.org | rem
 Host smetana.debian.org | smetana
   Hostname smetana.debian.org
   User madduck
-
-Host cvs.debian.org
-  HostKeyAlias gluck.debian.org
+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
@@ -349,6 +381,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