remove dupes, cleanups

git-svn-id: file:///svn/tfheen/trunk/dotfiles@93 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/ssh/config b/ssh/config
index 7eda912c4378ee5cf323471ea970465774aceab0..ef7ff065e0926369e35b6b33decb572572c005c9 100644 (file)
--- a/ssh/config
+++ b/ssh/config
@@ -1,32 +1,21 @@
 
-Host news.opera.no
-Protocol 2,1
-User root
+# PVV
+
+Host bacchus
+Hostname bacchus.pvv.org
 
 Host echelon
 Hostname echelon.pvv.ntnu.no
 User root
 ProxyCommand ssh -q -a -x proto.pvv.org nc %h 22
 
+# Samfundet
+
 Host backup-samfundet
 Hostname 129.241.43.202
 User tfheen
 ProxyCommand ssh -q -a -x cirkus.samfundet.no nc %h 22
 
-Host millway
-Hostname millway.intern.opera.no
-ProxyCommand ssh -q -a -x stargate.opera.com nc %h 22
-
-Host add.no
-Hostname add.no
-User tollef
-
-Host zip.no
-User root
-
-Host developer
-Hostname developer.skolelinux.no
-
 Host cirkus
 Hostname cirkus.samfundet.no
 
@@ -36,200 +25,50 @@ Hostname cassarossa.samfundet.no
 Host gagatan
 Hostname gagatan.samfundet.no
 
-Host alfa
-Hostname alfa.hardware.no
-
-Host beta
-Hostname beta.hardware.no
-
-Host gamma
-Hostname gamma.hardware.no
-
-Host delta
-Hostname delta.hardware.no
-
-Host epsilon
-Hostname epsilon.hardware.no
-
-Host eta
-Hostname eta.hardware.no
-
-Host zeta
-Hostname zeta.hardware.no
-
-Host omega
-Hostname omega.hardware.no
-
-Host tank
-Hostname b139b.studby.ntnu.no
-
-Host polly
-Hostname v021c.studby.ntnu.no
-
-Host vier
-Hostname vier.idi.ntnu.no
-
-Host auric
-Hostname auric.debian.org
-
-Host gluck
-Hostname gluck.debian.org
-
-Host klecker
-Hostname klecker.debian.org
-
-Host pandora
-Hostname pandora.debian.org
-
-Host bayer
-Hostname bayer.isfit.org
-
-Host bacchus
-Hostname bacchus.pvv.org
-
-Host vawad
-Hostname vawad.samfundet.no
-
-Host cysteine
-Hostname cysteine.codon.org.uk
+# Opera
 
+Host millway
+Hostname millway.intern.opera.no
+ProxyCommand ssh -q -a -x stargate.opera.com nc %h 22
 
 Host news.opera.no
 Protocol 2,1
 User root
 
-Host echelon
-Hostname echelon.pvv.ntnu.no
-User root
-ProxyCommand ssh -q -a -x proto.pvv.org nc %h 22
-
-Host backup-samfundet
-Hostname 129.241.43.202
-User tfheen
-ProxyCommand ssh -q -a -x cirkus.samfundet.no nc %h 22
-
-Host millway
-Hostname millway.intern.opera.no
-ProxyCommand ssh -q -a -x stargate.opera.com nc %h 22
+# Private / misc
 
 Host add.no
 Hostname add.no
 User tollef
 
-Host zip.no
-User root
+Host cysteine
+Hostname cysteine.codon.org.uk
 
 Host developer
 Hostname developer.skolelinux.no
 
-Host cirkus
-Hostname cirkus.samfundet.no
-
-Host cassarossa
-Hostname cassarossa.samfundet.no
-
-Host gagatan
-Hostname gagatan.samfundet.no
-
-Host alfa
-Hostname alfa.hardware.no
-
-Host beta
-Hostname beta.hardware.no
-
-Host gamma
-Hostname gamma.hardware.no
-
-Host delta
-Hostname delta.hardware.no
-
-Host epsilon
-Hostname epsilon.hardware.no
-
-Host eta
-Hostname eta.hardware.no
-
-Host zeta
-Hostname zeta.hardware.no
+Host polly
+Hostname v021c.studby.ntnu.no
 
-Host omega
-Hostname omega.hardware.no
+Host raw.no
+User cvs
+IdentityFile ~/.ssh/sshanoncvs
+ForwardAgent no
+ForwardX11 no
 
 Host tank
 Hostname b139b.studby.ntnu.no
 
-Host polly
-Hostname v021c.studby.ntnu.no
+Host vawad
+Hostname vawad.samfundet.no
 
 Host vier
 Hostname vier.idi.ntnu.no
 
-Host auric
-Hostname auric.debian.org
-
-Host gluck
-Hostname gluck.debian.org
-
-Host klecker
-Hostname klecker.debian.org
-
-Host pandora
-Hostname pandora.debian.org
-
 Host bayer
 Hostname bayer.isfit.org
 
-Host bacchus
-Hostname bacchus.pvv.org
-
-Host vawad
-Hostname vawad.samfundet.no
-
-Host cysteine
-Hostname cysteine.codon.org.uk
-
-
-#Host cvs.raw.no
-#User cvs
-#IdentityFile ~/.ssh/anoncvs
-#ForwardAgent no
-#ForwardX11 no
-Host news.opera.no
-Protocol 2,1
-User root
-
-Host echelon
-Hostname echelon.pvv.ntnu.no
-User root
-ProxyCommand ssh -q -a -x proto.pvv.org nc %h 22
-
-Host backup-samfundet
-Hostname 129.241.43.202
-User tfheen
-ProxyCommand ssh -q -a -x cirkus.samfundet.no nc %h 22
-
-Host millway
-Hostname millway.intern.opera.no
-ProxyCommand ssh -q -a -x stargate.opera.com nc %h 22
-
-Host add.no
-Hostname add.no
-User tollef
-
-Host zip.no
-User root
-
-Host developer
-Hostname developer.skolelinux.no
-
-Host cirkus
-Hostname cirkus.samfundet.no
-
-Host cassarossa
-Hostname cassarossa.samfundet.no
-
-Host gagatan
-Hostname gagatan.samfundet.no
+# Hardware.no
 
 Host alfa
 Hostname alfa.hardware.no
@@ -255,14 +94,7 @@ Hostname zeta.hardware.no
 Host omega
 Hostname omega.hardware.no
 
-Host tank
-Hostname b139b.studby.ntnu.no
-
-Host polly
-Hostname v021c.studby.ntnu.no
-
-Host vier
-Hostname vier.idi.ntnu.no
+# Debian
 
 Host auric
 Hostname auric.debian.org
@@ -275,21 +107,3 @@ Hostname klecker.debian.org
 
 Host pandora
 Hostname pandora.debian.org
-
-Host bayer
-Hostname bayer.isfit.org
-
-Host bacchus
-Hostname bacchus.pvv.org
-
-Host vawad
-Hostname vawad.samfundet.no
-
-Host cysteine
-Hostname cysteine.codon.org.uk
-
-Host raw.no
-User cvs
-IdentityFile ~/.ssh/sshanoncvs
-ForwardAgent no
-ForwardX11 no