]> git.madduck.net Git - etc/ssh.git/blobdiff - .ssh/config.in

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

new host keys for diamond and shelter
[etc/ssh.git] / .ssh / config.in
index 8d7789fe424e4a61cf9d1c4afece470ff3968912..3e4c917d432b3bda6512ecc0be1a7c18d2cf7091 100644 (file)
@@ -41,6 +41,9 @@ Host ambassador.madduck.net | ambassador
 Host alan.madduck.net | alan
   ForwardAgent yes
   Hostname alan.madduck.net
 Host alan.madduck.net | alan
   ForwardAgent yes
   Hostname alan.madduck.net
+Host git.madduck.net | git
+  User git
+  HostKeyAlias alan.madduck.net
 
 Host swan.madduck.net | swan
   ForwardAgent yes
 
 Host swan.madduck.net | swan
   ForwardAgent yes
@@ -50,6 +53,10 @@ Host pulse.madduck.net | pulse
   ForwardAgent yes
   Hostname pulse.madduck.net
 
   ForwardAgent yes
   Hostname pulse.madduck.net
 
+Host vera.madduck.net | vera
+  ForwardAgent yes
+  Hostname vera.madduck.net
+
 Host seamus.madduck.net | seamus
   ForwardAgent yes
   Hostname seamus.madduck.net
 Host seamus.madduck.net | seamus
   ForwardAgent yes
   Hostname seamus.madduck.net
@@ -58,6 +65,10 @@ Host cymbaline.madduck.net | cymbaline
   ForwardAgent yes
   Hostname cymbaline.madduck.net
 
   ForwardAgent yes
   Hostname cymbaline.madduck.net
 
+Host lunatic.madduck.net | lunatic
+  ForwardAgent yes
+  Hostname lunatic.madduck.net
+
 ### KHYBER KVM HOST
 
 Host khyber.madduck.net | khyber
 ### KHYBER KVM HOST
 
 Host khyber.madduck.net | khyber
@@ -75,12 +86,6 @@ Host bike.madduck.net | bike
 Host lotus.madduck.net | lotus
   ForwardAgent yes
   Hostname lotus.madduck.net
 Host lotus.madduck.net | lotus
   ForwardAgent yes
   Hostname lotus.madduck.net
-Host git.madduck.net | git
-  User git
-  HostKeyAlias lotus.madduck.net
-Host git.debian.ch
-  User git
-  HostKeyAlias lotus.madduck.net
 Host martin-krafft.net
   User madduck
   HostKeyAlias lotus.madduck.net
 Host martin-krafft.net
   User madduck
   HostKeyAlias lotus.madduck.net
@@ -109,6 +114,10 @@ Host openvpn.madduck.net | openvpn
 
 ### UNI ZURICH MACHINES
 
 
 ### UNI ZURICH MACHINES
 
+Host eugene.madduck.net | eugene
+  ForwardAgent yes
+  Hostname eugene.madduck.net
+
 Host diamond.madduck.net | diamond
   ForwardAgent yes
   Hostname diamond.madduck.net
 Host diamond.madduck.net | diamond
   ForwardAgent yes
   Hostname diamond.madduck.net
@@ -136,16 +145,6 @@ Host shelter.madduck.net | shelter
 Host backup.madduck.net | backup
   HostKeyAlias shelter.madduck.net
 
 Host backup.madduck.net | backup
   HostKeyAlias shelter.madduck.net
 
-Host sergei.ifi.uzh.ch | sergei
-  Hostname sergei.ifi.uzh.ch
-  User krafft
-Host nikolai.ifi.uzh.ch | nikolai
-  Hostname nikolai.ifi.uzh.ch
-  User krafft
-Host franz.ifi.uzh.ch | franz
-  Hostname franz.ifi.uzh.ch
-  User krafft
-
 ### PIPER / BYTEMARK
 
 Host piper.madduck.net | piper
 ### PIPER / BYTEMARK
 
 Host piper.madduck.net | piper
@@ -156,14 +155,6 @@ Host piper.madduck.net | piper
 Host cirrus.madduck.net | cirrus
   Hostname cirrus.madduck.net
 
 Host cirrus.madduck.net | cirrus
   Hostname cirrus.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
-
 ### GERN
 
 Host wall.gern.madduck.net | wall
 ### GERN
 
 Host wall.gern.madduck.net | wall
@@ -178,7 +169,7 @@ Host julia.gern.madduck.net | julia
 
 Host julia-via-diamond
   Hostname julia.gern.madduck.net
 
 Host julia-via-diamond
   Hostname julia.gern.madduck.net
-  ProxyCommand ssh diamond.madduck.net nc -q0 %h %p
+  ProxyJump diamond.madduck.net
 
 Host git.gern.madduck.net | git.gern
   ForwardAgent yes
 
 Host git.gern.madduck.net | git.gern
   ForwardAgent yes
@@ -198,6 +189,7 @@ Host pict.gern.madduck.net | pict
 Host jugband.gern.madduck.net | jugband.gern | jugband
   Hostname jugband.gern.madduck.net
   ForwardX11 yes
 Host jugband.gern.madduck.net | jugband.gern | jugband
   Hostname jugband.gern.madduck.net
   ForwardX11 yes
+  ForwardAgent yes
   HostKeyAlias jugband.gern
 
 Host visitor*.gern.madduck.net | visitor*.gern | visitor*
   HostKeyAlias jugband.gern
 
 Host visitor*.gern.madduck.net | visitor*.gern | visitor*
@@ -224,7 +216,11 @@ Host albatross-luks
 
 Host albatross-via-diamond
   Hostname albatross.lehel.madduck.net
 
 Host albatross-via-diamond
   Hostname albatross.lehel.madduck.net
-  ProxyCommand ssh diamond.madduck.net nc -q0 %h %p
+  ProxyJump diamond.madduck.net
+
+Host visitor*.lehel.madduck.net | visitor*.lehel
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
 
 ### GAUTING
 
 
 ### GAUTING
 
@@ -246,17 +242,9 @@ Host mothere
   ForwardX11 yes
   HostKeyAlias mother.gauting.madduck.net
 
   ForwardX11 yes
   HostKeyAlias mother.gauting.madduck.net
 
-Host brick.gauting.madduck.net | brick
-  Hostname brick.gauting.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-Host bricke
-  Hostname embryo.gauting.madduck.net
-  Port 22222
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias brick.gauting.madduck.net
+Host visitor*.lehel.madduck.net | visitor*.lehel
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
 
 ### MOUNT VICTORIA
 
 
 ### MOUNT VICTORIA
 
@@ -264,6 +252,10 @@ Host atom.mtvic.madduck.net | atom.mtvic | atom
   Hostname atom.mtvic.madduck.net
   ForwardAgent yes
 
   Hostname atom.mtvic.madduck.net
   ForwardAgent yes
 
+Host atom-via-sysyphus
+  HostKeyAlias atom.mtvic.madduck.net
+  ProxyCommand ssh sysyphus.madduck.net nc -q0 localhost 22015
+
 Host bell.mtvic.madduck.net | bell.mtvic | bell | chip
   Hostname bell.mtvic.madduck.net
   ForwardAgent yes
 Host bell.mtvic.madduck.net | bell.mtvic | bell | chip
   Hostname bell.mtvic.madduck.net
   ForwardAgent yes
@@ -281,7 +273,14 @@ Host fishbowl | fishbowl.rw.madduck.net
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias fishbowl
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias fishbowl
-  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,lehel,gauting,mtvic,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; nc -vq0 \${TARGETS%%%%,*} %p"
+  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,lehel,gauting,mtvic,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; exec nc -vq0 \${TARGETS%%%%,*} %p"
+
+### PHONES
+
+Host sgs7e | sgs7e.phones.*
+  Port 2222
+  User admin
+  HostName sgs7e.phones
 
 ### LOCAL VIRT HOSTS
 
 
 ### LOCAL VIRT HOSTS
 
@@ -321,20 +320,15 @@ Match host *.debian.org
 
 Host nelson.debconf.org | penta.debconf.org | nelson | summit | summit.debconf.org
   Hostname nelson.debconf.org
 
 Host nelson.debconf.org | penta.debconf.org | nelson | summit | summit.debconf.org
   Hostname nelson.debconf.org
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
+  ProxyJump sysyphus.madduck.net
 
 Host itchy.debconf.org | itchy | wafer.debconf.org | wafer
   Hostname itchy.debconf.org
 
 Host itchy.debconf.org | itchy | wafer.debconf.org | wafer
   Hostname itchy.debconf.org
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
+  ProxyJump sysyphus.madduck.net
 
 Host kent.debconf.org | kent
   Hostname kent.debconf.org
 
 Host kent.debconf.org | kent
   Hostname kent.debconf.org
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
-
-### PENNY
-
-Host lion.mjollnir.org | lion | fog.mjollnir.org | fog
-  Hostname lion.mjollnir.org
+  ProxyJump sysyphus.madduck.net
 
 ### TILDE CLUB
 
 
 ### TILDE CLUB
 
@@ -343,18 +337,10 @@ Host remotes.club
   Port 9022
   User madduck
 
   Port 9022
   User madduck
 
-Host tilde.camp
-  Hostname tilde.camp
-  User madduck
-
 Host squiggle.city
   Hostname squiggle.city
   User madduck
 
 Host squiggle.city
   Hostname squiggle.city
   User madduck
 
-Host tilde.city
-  Hostname 001.tilde.city
-  User madduck
-
 ### NZ
 
 Host workbuffer.org | nz
 ### NZ
 
 Host workbuffer.org | nz
@@ -375,6 +361,14 @@ Host gitlab.debian.net | git.fosscommunity.in
   Hostname gitlab.debian.net
   User gitlab
 
   Hostname gitlab.debian.net
   User gitlab
 
+Host grimble.mtfk.de | grimble | mtfk
+  CheckHostIP no
+  Hostname grimble.mtfk.de
+
+Host lion.mjollnir.org | lion
+  Hostname lion.mjollnir.org
+  User madduck
+
 ### DEFAULTS
 
 Match host *.madduck.net
 ### DEFAULTS
 
 Match host *.madduck.net