X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/68e9f09e412e5650a02cde02c78fe6551421b1d8..b53a982c0372876cf39b64e8c6ce1546054fcc91:/.ssh/config.in?ds=sidebyside

diff --git a/.ssh/config.in b/.ssh/config.in
index 90b0991..5718169 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 scratch.madduck.net | scratch
-  User madduck
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
 Host debian.madduck.net | debian
   User madduck
   HostKeyAlias pulse.madduck.net
@@ -23,11 +19,6 @@ 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
@@ -56,6 +47,15 @@ Host git.debian.ch
   User git
   HostKeyAlias lotus.madduck.net
 
+Host sysyphus.madduck.net | sysyphus
+  ForwardAgent yes
+  Hostname sysyphus.madduck.net
+Host ssh443.madduck.net | ssh443
+  User madduck
+  HostKeyAlias sysyphus.madduck.net
+  ForwardAgent yes
+  Port 443
+
 Host jugband.madduck.net | jugband
   ForwardAgent yes
   Hostname jugband.madduck.net
@@ -78,6 +78,7 @@ Host domine.madduck.net | domine
 
 Host irc
   Hostname vera.madduck.net
+  ConnectTimeout 60
 
 Host martin-krafft.net
   User madduck
@@ -91,18 +92,22 @@ Host madduck.net
 Host imap.madduck.net
   HostKeyAlias seamus.madduck.net
 
-Host bell.madduck.net | bell
+Host diamond.madduck.net | diamond
   ForwardAgent yes
-  Hostname bell.madduck.net
+  Hostname diamond.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
+  HostKeyAlias diamond.madduck.net
+Host flics.madduck.net | flics
+  AddressFamily inet
+  ControlMaster no
+  Hostname flics.madduck.net
+  HostKeyAlias diamond.madduck.net
+Host scratch.madduck.net | scratch
+  User madduck
+  HostKeyAlias diamond.madduck.net
 
 Host shelter.madduck.net | shelter
   ForwardAgent yes
@@ -112,23 +117,23 @@ Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
   Hostname sheep.umverkehr.ch
   User madduck
 
-Host lapse.rw.madduck.net | lapse.oerlikon.madduck.net | lapse
+Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
 
-Host fishbowl.rw.madduck.net | fishbowl.oerlikon.madduck.net | fishbowl
+Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
 
-Host wall.oerlikon.madduck.net | wall
+Host wall.gern.madduck.net | wall
   CheckHostIP no
   ForwardAgent yes
-  Hostname wall.oerlikon.madduck.net
+  Hostname wall.gern.madduck.net
 
-Host julia.oerlikon.madduck.net | julia
-  Hostname julia.oerlikon.madduck.net
+Host julia.gern.madduck.net | julia
+  Hostname julia.gern.madduck.net
   ForwardAgent yes
 
 Host embryo.gauting.madduck.net | embryo
@@ -137,37 +142,37 @@ Host embryo.gauting.madduck.net | embryo
   Hostname embryo.gauting.madduck.net
   HostKeyAlias embryo.gauting.madduck.net
 
-Host piper.oerlikon.madduck.net | piper
-  Hostname piper.oerlikon.madduck.net
+Host piper.gern.madduck.net | piper
+  Hostname piper.gern.madduck.net
   ForwardAgent yes
   ForwardX11 yes
 Host pipere
-  Hostname wall.oerlikon.madduck.net
+  Hostname wall.gern.madduck.net
   Port 22223
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias piper.oerlikon.madduck.net
+  HostKeyAlias piper.gern.madduck.net
 
-Host albatross.oerlikon.madduck.net | albatross
-  Hostname albatross.oerlikon.madduck.net
+Host albatross.gern.madduck.net | albatross
+  Hostname albatross.gern.madduck.net
   ForwardAgent yes
   ForwardX11 yes
 Host albatrosse
-  Hostname wall.oerlikon.madduck.net
-  Port 22224
+  Hostname wall.gern.madduck.net
+  Port 22222
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias albatross.oerlikon.madduck.net
+  HostKeyAlias albatross.gern.madduck.net
 
-Host pict.oerlikon.madduck.net | pict
-  Hostname pict.oerlikon.madduck.net
+Host pict.gern.madduck.net | pict
+  Hostname pict.gern.madduck.net
   ForwardAgent yes
   ForwardX11 yes
 #  AddressFamily inet
 
-Host nokia-n900.oerlikon.madduck.net | nokia-n900 | n900
+Host nokia-n900.gern.madduck.net | nokia-n900 | n900
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes