]> git.madduck.net Git - etc/ssh.git/commitdiff

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:

cleanup of config
authormartin f. krafft <madduck@madduck.net>
Sun, 14 Oct 2012 16:31:09 +0000 (18:31 +0200)
committermartin f. krafft <madduck@madduck.net>
Sun, 14 Oct 2012 16:31:09 +0000 (18:31 +0200)
.ssh/config.in

index 8d6c4e9e4a30bcf10a4789546affc5ba1f177766..342a9d72039313f36fd21f789b0713dc1e2822f5 100644 (file)
@@ -4,24 +4,17 @@ Host 127.0.0.1 | localhost
   ForwardX11Trusted yes
   NoHostAuthenticationForLocalhost yes
 
   ForwardX11Trusted yes
   NoHostAuthenticationForLocalhost yes
 
-Host pulse.madduck.net | pulse
+### CHARADE KVM HOST
+
+Host charade.madduck.net | charade
   ForwardAgent yes
   ForwardAgent yes
-  Hostname pulse.madduck.net
-  #AddressFamily inet
-Host svn.madduck.net | svn
-  User madduck
-  HostKeyAlias pulse.madduck.net
-Host debian.madduck.net | debian
-  User madduck
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
-Host openvpn.madduck.net | openvpn
-  User madduck
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
-Host backup.madduck.net | backup
-  HostKeyAlias pulse.madduck.net
-  #AddressFamily inet
+  Hostname 192.168.14.153
+Host charade-vnc
+  ControlMaster no
+  ControlPath none
+  Hostname 192.168.14.153
+
+### KHYBER KVM HOST
 
 Host khyber.madduck.net | khyber
   ForwardAgent yes
 
 Host khyber.madduck.net | khyber
   ForwardAgent yes
@@ -31,11 +24,9 @@ Host khyber-vnc
   ControlPath none
   Hostname khyber.madduck.net
 
   ControlPath none
   Hostname khyber.madduck.net
 
-Host wots.madduck.net | wots
+Host vera.madduck.net | vera
   ForwardAgent yes
   ForwardAgent yes
-  Hostname wots.madduck.net
-Host buildd.debian.madduck.net | buildd
-  HostKeyAlias wots.madduck.net
+  Hostname vera.madduck.net
 
 Host lotus.madduck.net | lotus
   ForwardAgent yes
 
 Host lotus.madduck.net | lotus
   ForwardAgent yes
@@ -46,55 +37,60 @@ Host git.madduck.net | git
 Host git.debian.ch
   User git
   HostKeyAlias lotus.madduck.net
 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
+Host martin-krafft.net
   User madduck
   User madduck
-  HostKeyAlias sysyphus.madduck.net
-  ForwardAgent yes
-  Port 443
+  HostKeyAlias lotus.madduck.net
+Host phd.martin-krafft.net
+  User madduck
+  HostKeyAlias lotus.madduck.net
+Host madduck.net
+  User madduck
+  HostKeyAlias lotus.madduck.net
 
 Host jugband.madduck.net | jugband
   ForwardAgent yes
   Hostname jugband.madduck.net
 
 
 Host jugband.madduck.net | jugband
   ForwardAgent yes
   Hostname jugband.madduck.net
 
-Host vera.madduck.net | vera
-  ForwardAgent yes
-  Hostname vera.madduck.net
-
-Host swan-host | swan-host.madduck.net
-  Hostname swan-host.madduck.net
-  User krafft
-
-Host swan.madduck.net | swan
-  ForwardAgent yes
-  Hostname swan.madduck.net
-
 Host domine.madduck.net | domine
   ForwardAgent yes
   Hostname domine.madduck.net
 Host domine.madduck.net | domine
   ForwardAgent yes
   Hostname domine.madduck.net
-
 Host irc
 Host irc
+  User madduck
   Hostname domine.madduck.net
   ConnectTimeout 60
   Hostname domine.madduck.net
   ConnectTimeout 60
-
-Host martin-krafft.net
-  User madduck
-  HostKeyAlias seamus.madduck.net
-Host phd.martin-krafft.net
-  User madduck
-  HostKeyAlias seamus.madduck.net
-Host madduck.net
-  User madduck
-  HostKeyAlias seamus.madduck.net
 Host imap.madduck.net
   HostKeyAlias domine.madduck.net
 
 Host imap.madduck.net
   HostKeyAlias domine.madduck.net
 
+Host aika.krafftwerk.de | aika
+  Hostname aika.krafftwerk.de
+
+Host vizier.madduck.net | vizier
+  ForwardAgent yes
+  Hostname vizier.madduck.net
+
+Host sysyphus.madduck.net | sysyphus
+  ForwardAgent yes
+  Hostname sysyphus.madduck.net
+Host ssh443.madduck.net | ssh443
+  HostKeyAlias sysyphus.madduck.net
+  ForwardAgent yes
+  Port 443
+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
   ForwardAgent yes
   Hostname diamond.madduck.net
 Host diamond.madduck.net | diamond
   ForwardAgent yes
   Hostname diamond.madduck.net
+Host debian.madduck.net | debian
+  HostKeyAlias diamond.madduck.net
 Host scratch.madduck.net | scratch
   User madduck
   HostKeyAlias diamond.madduck.net
 Host scratch.madduck.net | scratch
   User madduck
   HostKeyAlias diamond.madduck.net
@@ -114,20 +110,36 @@ Host flics.madduck.net | flics
 Host shelter.madduck.net | shelter
   ForwardAgent yes
   Hostname shelter.madduck.net
 Host shelter.madduck.net | shelter
   ForwardAgent yes
   Hostname shelter.madduck.net
+Host backup.madduck.net | backup
+  HostKeyAlias shelter.madduck.net
 
 
-Host sheep.umverkehr.ch | sheep | webmail.madduck.net | webmail
-  Hostname sheep.umverkehr.ch
-  User madduck
+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
 
 
-Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
+### SWAN / BYTEMARK
 
 
-Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
-  CheckHostIP no
+Host swan-host | swan-host.madduck.net
+  Hostname swan-host.madduck.net
+  User krafft
+
+Host swan.madduck.net | swan
   ForwardAgent yes
   ForwardAgent yes
-  ForwardX11 yes
+  Hostname swan.madduck.net
+
+### ARNOLD / GPLHOST
+#
+Host arnold-host | arnold-host.madduck.net
+  Hostname arnold-host.madduck.net
+  User xen05
+
+### GERN
 
 Host wall.gern.madduck.net | wall
   CheckHostIP no
 
 Host wall.gern.madduck.net | wall
   CheckHostIP no
@@ -145,21 +157,6 @@ Host juliae
   ForwardX11 yes
   HostKeyAlias julia.gern.madduck.net
 
   ForwardX11 yes
   HostKeyAlias julia.gern.madduck.net
 
-Host galaxy-s2.phones.gern | galaxy-s2
-  Hostname galaxy-s2.phones.gern
-  User root
-
-Host embryo.gauting.madduck.net | embryo
-  CheckHostIP no
-  ForwardAgent yes
-  Hostname embryo.gauting.madduck.net
-  HostKeyAlias embryo.gauting.madduck.net
-
-Host piper.gern.madduck.net | piper
-  Hostname piper.gern.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-
 Host albatross.gern.madduck.net | albatross
   Hostname albatross.gern.madduck.net
   ForwardAgent yes
 Host albatross.gern.madduck.net | albatross
   Hostname albatross.gern.madduck.net
   ForwardAgent yes
@@ -172,20 +169,33 @@ Host albatrosse
   ForwardX11 yes
   HostKeyAlias albatross.gern.madduck.net
 
   ForwardX11 yes
   HostKeyAlias albatross.gern.madduck.net
 
+Host galaxy-s2.phones.gern | galaxy-s2
+  Hostname galaxy-s2.phones.gern
+  User root
+
 Host pict.gern.madduck.net | pict
   Hostname pict.gern.madduck.net
   ForwardAgent yes
   ForwardX11 yes
 Host pict.gern.madduck.net | pict
   Hostname pict.gern.madduck.net
   ForwardAgent yes
   ForwardX11 yes
-#  AddressFamily inet
 
 Host visitor*.gern.madduck.net | visitor*.gern | visitor*
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
 
 Host visitor*.gern.madduck.net | visitor*.gern | visitor*
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
-Host auge-fr.no-ip.org | auge
+### LEHEL
+
+Host clegg.lehel.madduck.net | clegg
   CheckHostIP no
   CheckHostIP no
-  Hostname auge-fr.no-ip.org
-  HostKeyAlias helena.home.mjollnir.org
+  ForwardAgent yes
+  Hostname clegg.lehel.madduck.net
+
+### GAUTING
+
+Host embryo.gauting.madduck.net | embryo
+  CheckHostIP no
+  ForwardAgent yes
+  Hostname embryo.gauting.madduck.net
+  HostKeyAlias embryo.gauting.madduck.net
 
 Host mother.gauting | mother | mother.gauting.madduck.net
   Hostname mother.gauting
 
 Host mother.gauting | mother | mother.gauting.madduck.net
   Hostname mother.gauting
@@ -211,24 +221,19 @@ Host bricke
   ForwardX11 yes
   HostKeyAlias brick.gauting.madduck.net
 
   ForwardX11 yes
   HostKeyAlias brick.gauting.madduck.net
 
-Host clegg.lehel.madduck.net | clegg
+### ROAD WARRIORS
+
+Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse
   CheckHostIP no
   ForwardAgent yes
   CheckHostIP no
   ForwardAgent yes
-  Hostname clegg.lehel.madduck.net
+  ForwardX11 yes
 
 
-Host zlinli.no-ip.org | zlinli
+Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
   CheckHostIP no
   CheckHostIP no
-  Hostname zlinli.no-ip.org
-
-Host debian-community.org | bikeshed.debian-community.org | bikeshed
-  Hostname bikeshed.debian-community.org
-  User madduck
-  ForwardAgent no
-  ForwardX11 no
+  ForwardAgent yes
+  ForwardX11 yes
 
 
-Host alioth.debian.org | alioth
-  hostKeyAlias wagner.debian.org
-  User madduck
+### DEBIAN
 
 Host svn.debian.org
   HostKeyAlias vasks.debian.org
 
 Host svn.debian.org
   HostKeyAlias vasks.debian.org
@@ -243,6 +248,10 @@ Host cvs.debian.org
   HostKeyAlias vasks.debian.org
   User madduck
 
   HostKeyAlias vasks.debian.org
   User madduck
 
+Host people.debian.org
+  HostKeyAlias ravel.debian.org
+  User madduck
+
 Host abel.debian.org | abel
   Hostname abel.debian.org
   User madduck
 Host abel.debian.org | abel
   Hostname abel.debian.org
   User madduck
@@ -364,34 +373,7 @@ Host zelenka.debian.org | zelenka
   Hostname zelenka.debian.org
   User madduck
 
   Hostname zelenka.debian.org
   User madduck
 
-Host people.debian.org
-  HostKeyAlias ravel.debian.org
-  User madduck
-
-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
-
-Host clegg-host | clegg-host.madduck.net | gratis2.opro.ch | opro
-  Hostname clegg-host.madduck.net
-  User madduck
-
-Host arnold-host | arnold-host.madduck.net
-  Hostname arnold-host.madduck.net
-  User xen05
-
-Host skynet.skynet.ie | skynet.ie | skynet
-  Hostname skynet.skynet.ie
-  User madduck
-
-Host aika.krafftwerk.de | aika
-  Hostname aika.krafftwerk.de
+### DEFAULTS
 
 Host *
 # AddressFamily any
 
 Host *
 # AddressFamily any