X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/31f1b5daba53283ae0c2c5e9f8807d6136540b2c..dcdca86ef12c6cf351f9788c007bf1ca833dea67:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index dccd0bd..899ff10 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -25,6 +25,10 @@ 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
@@ -136,6 +140,7 @@ Host swan-host | swan-host.madduck.net
 Host swan.madduck.net | swan
   ForwardAgent yes
   Hostname swan.madduck.net
+
 ### ARNOLD / GPLHOST
 
 Host arnold.madduck.net | arnold
@@ -159,28 +164,11 @@ 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 git.gern.madduck.net | git.gern
   ForwardAgent yes
   HostKeyAlias julia.gern.madduck.net
 
-Host fishbowl.gern.madduck.net | fishbowl.gern
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias fishbowl
-
-Host galaxy-s2.phones.gern | galaxy-s2
-  Hostname galaxy-s2.phones.gern
-  HostKeyAlias galaxy-s2.phones.gern
-  User root
-
 Host pict.gern.madduck.net | pict
   Hostname pict.gern.madduck.net
   ForwardAgent yes
@@ -192,7 +180,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
@@ -202,18 +190,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
 
 ### GAUTING
 
@@ -867,17 +843,30 @@ 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 | remotes.club
+Host remotes.club
   Hostname remotes.club
   Port 9022
   User madduck
 
-Host tilde-camp | tilde.camp
+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