X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/a2cba0425ed071aea9dbff1319942a05326c1084..c7a597cfdd67dbd8e4812591e8b32b56f2b7c18f:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 1c02180..bd62740 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -14,6 +14,10 @@ Host charade-vnc
   ControlPath none
   Hostname charade.madduck.net
 
+Host emily.madduck.net | emily
+  ForwardAgent yes
+  Hostname emily.madduck.net
+
 Host matilda.madduck.net | matilda
   ForwardAgent yes
   Hostname matilda.madduck.net
@@ -21,6 +25,14 @@ Host matilda.madduck.net | matilda
 Host vizier.madduck.net | vizier
   ForwardAgent yes
   Hostname vizier.madduck.net
+Host admin.madduck.net | admin
+  Hostname admin.madduck.net
+  HostKeyAlias vizier.madduck.net
+  User git
+
+Host ambassador.madduck.net | ambassador
+  ForwardAgent yes
+  Hostname ambassador.madduck.net
 
 ### KHYBER KVM HOST
 
@@ -58,10 +70,6 @@ Host jugband.madduck.net | jugband
 Host domine.madduck.net | domine
   ForwardAgent yes
   Hostname domine.madduck.net
-Host irc
-  User madduck
-  Hostname domine.madduck.net
-  ConnectTimeout 60
 Host imap.madduck.net
   HostKeyAlias domine.madduck.net
 
@@ -78,12 +86,6 @@ Host ssh443.madduck.net | ssh443
 Host openvpn.madduck.net | openvpn
   HostKeyAlias sysyphus.madduck.net
 
-Host wots.madduck.net | wots
-  ForwardAgent yes
-  Hostname wots.madduck.net
-Host buildd.debian.madduck.net | buildd
-  HostKeyAlias wots.madduck.net
-
 ### UNI ZURICH MACHINES
 
 Host diamond.madduck.net | diamond
@@ -130,14 +132,22 @@ Host swan-host | swan-host.madduck.net
   User krafft
 
 Host swan.madduck.net | swan
-  ForwardAgent yes
   Hostname swan.madduck.net
 
+Host piper.madduck.net | piper
+  Hostname piper.madduck.net
+
 ### ARNOLD / GPLHOST
 
+Host arnold.madduck.net | arnold
+  Hostname arnold.madduck.net
 Host arnold-host | arnold-host.madduck.net
   Hostname arnold-host.madduck.net
   User xen05
+Host irc
+  User madduck
+  Hostname arnold.madduck.net
+  ConnectTimeout 60
 
 ### GERN
 
@@ -149,23 +159,10 @@ Host wall.gern.madduck.net | wall
 Host julia.gern.madduck.net | julia
   Hostname julia.gern.madduck.net
   ForwardAgent yes
-Host juliae
-  Hostname wall.gern.madduck.net
-  Port 22002
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias julia.gern.madduck.net
 
-Host fishbowl.gern.madduck.net | fishbowl.gern
+Host git.gern.madduck.net | git.gern
   ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias fishbowl.gern
-
-Host galaxy-s2.phones.gern | galaxy-s2
-  Hostname galaxy-s2.phones.gern
-  HostKeyAlias galaxy-s2.phones.gern
-  User root
+  HostKeyAlias julia.gern.madduck.net
 
 Host pict.gern.madduck.net | pict
   Hostname pict.gern.madduck.net
@@ -178,7 +175,7 @@ Host visitor*.gern.madduck.net | visitor*.gern | visitor*
 
 ### LEHEL
 
-Host clegg.lehel.madduck.net | clegg
+Host clegg.lehel.madduck.net | clegg.lehel | clegg
   CheckHostIP no
   ForwardAgent yes
   Hostname clegg.lehel.madduck.net
@@ -188,18 +185,6 @@ Host albatross.lehel.madduck.net | albatross.lehel | albatross
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias albatross.lehel
-Host albatrosse
-  Hostname wall.lehel.madduck.net
-  Port 22032
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias albatross.lehel
-
-Host fishbowl.lehel.madduck.net | fishbowl.lehel
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias fishbowl.lehel
 
 ### GAUTING
 
@@ -241,10 +226,23 @@ Host atom.mtvic.madduck.net | atom.mtvic | atom
 
 ### ROAD WARRIORS
 
-Host fishbowl
+Host fishbowl | fishbowl.gern | fishbowl.lehel | fishbowl.rw.madduck.net
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
+  HostKeyAlias fishbowl
+  CanonicalizeHostname yes
+  CanonicalizeMaxDots 0
+  CanonicalDomains gern.madduck.net lehel.madduck.net rw.madduck.net
+
+### LOCAL VIRT HOSTS
+
+Host *.virt
+  CheckHostIP no
+  ForwardAgent yes
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+  ControlMaster no
 
 ### DEBIAN
 
@@ -287,7 +285,7 @@ Host ancina.debian.org | ancina
 Host antheil.debian.org | antheil
   Hostname antheil.debian.org
   User madduck
-Host arnold.debian.org | arnold
+Host arnold.debian.org
   Hostname arnold.debian.org
   User madduck
 Host asdfasdf.debian.net | asdfasdf
@@ -849,6 +847,34 @@ Host zemlinsky.debian.org | zemlinsky
   Hostname zemlinsky.debian.org
   User madduck
 
+Host nelson.debconf.org | penta.debconf.org | nelson | summit
+  Hostname nelson.debconf.org
+  ProxyCommand ssh people.debian.org nc -q0 %h %p
+
+### PENNY
+
+Host lion.mjollnir.org | lion | fog.mjollnir.org | fog
+  Hostname lion.mjollnir.org
+
+### TILDE CLUB
+
+Host remotes.club
+  Hostname remotes.club
+  Port 9022
+  User madduck
+
+Host tilde.camp
+  Hostname tilde.camp
+  User madduck
+
+Host squiggle.city
+  Hostname squiggle.city
+  User madduck
+
+Host tilde.city
+  Hostname 001.tilde.city
+  User madduck
+
 ### NZ
 
 Host workbuffer.org | nz
@@ -876,7 +902,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
-  ControlPersist 5
+  ControlPersist 30
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no