From: martin f. krafft Date: Thu, 27 Oct 2011 19:21:02 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/dc07e6c5c6245f67b1add9b5eb3596f01e41968b?ds=sidebyside;hp=-c;pf=etc Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh Conflicts: .ssh/config.in --- dc07e6c5c6245f67b1add9b5eb3596f01e41968b diff --combined .ssh/config.in index 2fcb4db,f93c263..67ff7e7 --- a/.ssh/config.in +++ b/.ssh/config.in @@@ -11,10 -11,6 +11,6 @@@ Host pulse.madduck.net | puls Host svn.madduck.net | svn User madduck HostKeyAlias pulse.madduck.net - Host scratch.madduck.net | scratch - User madduck - HostKeyAlias pulse.madduck.net - #AddressFamily inet Host debian.madduck.net | debian User madduck HostKeyAlias pulse.madduck.net @@@ -23,11 -19,6 +19,6 @@@ Host openvpn.madduck.net | openvp User madduck HostKeyAlias pulse.madduck.net #AddressFamily inet - Host ssh443.madduck.net | ssh443 - User madduck - HostKeyAlias pulse.madduck.net - ForwardAgent yes - Port 443 Host backup.madduck.net | backup HostKeyAlias pulse.madduck.net #AddressFamily inet @@@ -56,6 -47,15 +47,15 @@@ Host git.debian.c User git HostKeyAlias lotus.madduck.net + Host sysyphus.madduck.net | sysyphus + ForwardAgent yes + Hostname sysyphus.madduck.net + Host ssh443.madduck.net | ssh443 + User madduck + HostKeyAlias sysyphus.madduck.net + ForwardAgent yes + Port 443 + Host jugband.madduck.net | jugband ForwardAgent yes Hostname jugband.madduck.net @@@ -78,6 -78,7 +78,7 @@@ Host domine.madduck.net | domin Host irc Hostname vera.madduck.net + ConnectTimeout 60 Host martin-krafft.net User madduck @@@ -91,13 -92,9 +92,17 @@@ Host madduck.ne Host imap.madduck.net HostKeyAlias seamus.madduck.net - Host bell.madduck.net | bell ++Host diamond.madduck.net | diamond + ForwardAgent yes ++<<<<<<< HEAD + Hostname bell.madduck.net + Host diamond.madduck.net | diamond ForwardAgent yes Hostname diamond.madduck.net ++Host scratch.madduck.net | scratch ++ User madduck ++ HostKeyAlias diamond.madduck.net Host tunes.madduck.net | tunes AddressFamily inet ControlMaster no @@@ -108,6 -105,9 +113,6 @@@ Host flics.madduck.net | flic ControlMaster no Hostname flics.madduck.net HostKeyAlias diamond.madduck.net -Host scratch.madduck.net | scratch - User madduck - HostKeyAlias diamond.madduck.net Host shelter.madduck.net | shelter ForwardAgent yes @@@ -117,24 -117,31 +122,31 @@@ Host sheep.umverkehr.ch | sheep | webma Hostname sheep.umverkehr.ch User madduck - Host lapse.rw.madduck.net | lapse.oerlikon.madduck.net | lapse + Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse CheckHostIP no ForwardAgent yes ForwardX11 yes - Host fishbowl.rw.madduck.net | fishbowl.oerlikon.madduck.net | fishbowl + Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl CheckHostIP no ForwardAgent yes ForwardX11 yes - Host wall.oerlikon.madduck.net | wall + Host wall.gern.madduck.net | wall CheckHostIP no ForwardAgent yes - Hostname wall.oerlikon.madduck.net + Hostname wall.gern.madduck.net - Host julia.oerlikon.madduck.net | julia - Hostname julia.oerlikon.madduck.net + 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 embryo.gauting.madduck.net | embryo CheckHostIP no @@@ -142,37 -149,30 +154,30 @@@ Hostname embryo.gauting.madduck.net HostKeyAlias embryo.gauting.madduck.net - Host piper.oerlikon.madduck.net | piper - Hostname piper.oerlikon.madduck.net - ForwardAgent yes - ForwardX11 yes - Host pipere - Hostname wall.oerlikon.madduck.net - Port 22223 - CheckHostIP no + Host piper.gern.madduck.net | piper + Hostname piper.gern.madduck.net ForwardAgent yes ForwardX11 yes - HostKeyAlias piper.oerlikon.madduck.net - Host albatross.oerlikon.madduck.net | albatross - Hostname albatross.oerlikon.madduck.net + Host albatross.gern.madduck.net | albatross + Hostname albatross.gern.madduck.net ForwardAgent yes ForwardX11 yes Host albatrosse - Hostname wall.oerlikon.madduck.net - Port 22223 + Hostname wall.gern.madduck.net + Port 22032 CheckHostIP no ForwardAgent yes ForwardX11 yes - HostKeyAlias albatross.oerlikon.madduck.net + HostKeyAlias albatross.gern.madduck.net - Host pict.oerlikon.madduck.net | pict - Hostname pict.oerlikon.madduck.net + Host pict.gern.madduck.net | pict + Hostname pict.gern.madduck.net ForwardAgent yes ForwardX11 yes # AddressFamily inet - Host nokia-n900.oerlikon.madduck.net | nokia-n900 | n900 + Host nokia-n900.gern.madduck.net | nokia-n900 | n900 CheckHostIP no ForwardAgent yes ForwardX11 yes @@@ -183,8 -183,8 +188,8 @@@ Host auge-fr.no-ip.org | aug Hostname auge-fr.no-ip.org HostKeyAlias helena.home.mjollnir.org - Host mother.gauting.madduck.net | mother - Hostname mother.gauting.madduck.net + Host mother.gauting | mother | mother.gauting.madduck.net + Hostname mother.gauting ForwardAgent yes ForwardX11 yes Host mothere @@@ -218,197 -218,141 +223,141 @@@ Host debian-community.org | bikeshed.de ForwardX11 no Host alioth.debian.org | alioth - Hostname alioth.debian.org + hostKeyAlias wagner.debian.org User madduck + Host svn.debian.org - HostKeyAlias alioth.debian.org + HostKeyAlias vasks.debian.org User madduck Host git.debian.org - HostKeyAlias alioth.debian.org + HostKeyAlias vasks.debian.org User madduck Host hg.debian.org - HostKeyAlias alioth.debian.org + HostKeyAlias vasks.debian.org User madduck Host cvs.debian.org - HostKeyAlias alioth.debian.org + HostKeyAlias vasks.debian.org User madduck - Host malo.debian.org | malo - Hostname malo.debian.org + Host abel.debian.org | abel + Hostname abel.debian.org User madduck - Host paer.debian.org | paer - Hostname paer.debian.org + Host agricola.debian.org | agricola + Hostname agricola.debian.org User madduck - Host crest.debian.org | crest - Hostname crest.debian.org + Host albeniz.debian.org | albeniz + Hostname albeniz.debian.org User madduck - Host saens.debian.org | saens - Hostname saens.debian.org + Host asdfasdf.debian.net | asdfasdf + Hostname asdfasdf.debian.net User madduck - Host spohr.debian.org | spohr - Hostname spohr.debian.org + Host busoni.debian.org | busoni + Hostname busoni.debian.org User madduck - Host gluck.debian.org | gluck - Hostname gluck.debian.org + Host cilea.debian.org | cilea + Hostname cilea.debian.org User madduck - Host elara.debian.org | elara - Hostname elara.debian.org + Host duarte.debian.org | duarte + Hostname duarte.debian.org User madduck - Host sarti.debian.org | sarti - Hostname sarti.debian.org + Host dukas.debian.org | dukas + Hostname dukas.debian.org User madduck - Host europa.debian.org | europa - Hostname europa.debian.org + Host glinka.debian.org | glinka + Hostname glinka.debian.org + User madduck + Host grieg.debian.org | grieg + Hostname grieg.debian.org + User madduck + Host io.debian.net | io + Hostname io.debian.net + User madduck + Host lindberg.debian.org | lindberg + Hostname lindberg.debian.org User madduck Host master.debian.org | master Hostname master.debian.org User madduck - Host bartok.debian.org | bartok - Hostname bartok.debian.org - User madduck Host merulo.debian.org | merulo Hostname merulo.debian.org User madduck - Host merkel.debian.org | merkel - Hostname merkel.debian.org - User madduck - Host murphy.debian.org | murphy - Hostname murphy.debian.org - User madduck - Host raptor.debian.org | raptor - Hostname raptor.debian.org - User madduck - Host tartini.debian.org | tartini - Hostname tartini.debian.org - User madduck - Host raff.debian.org | raff - Hostname raff.debian.org - User madduck - Host klecker.debian.org | klecker - Hostname klecker.debian.org - User madduck - Host voltaire.debian.org | voltaire - Hostname voltaire.debian.org + Host nono.debian.org | nono + Hostname nono.debian.org User madduck - Host bruckner.debian.org | bruckner - Hostname bruckner.debian.org - User madduck - Host kullervo.debian.org | kullervo - Hostname kullervo.debian.org - User madduck - Host samosa.debian.org | samosa - Hostname samosa.debian.org + Host paer.debian.org | paer + Hostname paer.debian.org User madduck - Host caballero.debian.org | caballero - Hostname caballero.debian.org + Host paganini.debian.org | paganini + Hostname paganini.debian.org User madduck Host pergolesi.debian.org | pergolesi Hostname pergolesi.debian.org User madduck - Host spontini.debian.org | spontini - Hostname spontini.debian.org - User madduck - Host mayr.debian.org | mayr - Hostname mayr.debian.org - User madduck - Host mayer.debian.org | mayer - Hostname mayer.debian.org - User madduck - Host agnesi.debian.org | agnesi - Hostname agnesi.debian.org - User madduck - Host puccini.debian.org | puccini - Hostname puccini.debian.org - User madduck - Host villa.debian.org | villa - Hostname villa.debian.org + Host pescetti.debian.org | pescetti + Hostname pescetti.debian.org User madduck Host piatti.debian.org | piatti Hostname piatti.debian.org User madduck - Host peri.debian.org | peri - Hostname peri.debian.org + Host powell.debian.org | powell + Hostname powell.debian.org User madduck - Host lobos.debian.org | lobos - Hostname lobos.debian.org + Host quantz.debian.org | quantz + Hostname quantz.debian.org User madduck - Host wagner.debian.org | wagner - Hostname wagner.debian.org + Host ravel.debian.org | ravel + Hostname ravel.debian.org User madduck - Host verdi.debian.org | verdi - Hostname verdi.debian.org + Host respighi.debian.org | respighi + Hostname respighi.debian.org User madduck Host ries.debian.org | ries Hostname ries.debian.org User madduck - Host goetz.debian.org | goetz - Hostname goetz.debian.org - User madduck - Host ravel.debian.org | ravel - Hostname ravel.debian.org - User madduck - Host rietz.debian.org | rietz - Hostname rietz.debian.org + Host rore.debian.org | rore + Hostname rore.debian.org User madduck - Host steffani.debian.org | steffani - Hostname steffani.debian.org - User madduck - Host lebrun.debian.org | lebrun - Hostname lebrun.debian.org + Host samosa.debian.org | samosa + Hostname samosa.debian.org User madduck - Host liszt.debian.org | liszt - Hostname liszt.debian.org + Host senfl.debian.org | senfl + Hostname senfl.debian.org User madduck - Host mundy.debian.org | mundy - Hostname mundy.debian.org + Host sh4.g15.jp | sh4 + Hostname sh4.g15.jp User madduck - Host albeniz.debian.org | albeniz - Hostname albeniz.debian.org + Host smetana.debian.org | smetana + Hostname smetana.debian.org User madduck Host sperger.debian.org | sperger Hostname sperger.debian.org User madduck - Host kassia.debian.org | kassia - Hostname kassia.debian.org - User madduck - Host agricola.debian.org | agricola - Hostname agricola.debian.org - User madduck - Host arcadelt.debian.org | arcadelt - Hostname arcadelt.debian.org + Host stabile.debian.org | stabile + Hostname stabile.debian.org User madduck - Host penalosa.debian.org | penalosa - Hostname penalosa.debian.org + Host strauss.debian.net | strauss + Hostname strauss.debian.net User madduck - Host argento.debian.org | argento - Hostname argento.debian.org + Host sumotsu.debian.net | sumotsu + Hostname sumotsu.debian.net User madduck - Host allegri.debian.org | allegri - Hostname allegri.debian.org + Host tye.debian.org | tye + Hostname tye.debian.org User madduck - Host morales.debian.org | morales - Hostname morales.debian.org + Host vasks.debian.org | vasks + Hostname vasks.debian.org User madduck - Host auber.debian.org | auber - Hostname auber.debian.org + Host vivaldi.debian.org | vivaldi + Hostname vivaldi.debian.org User madduck - Host mahler.debian.org | mahler - Hostname mahler.debian.org - User madduck - Host schroeder.debian.org | schroeder - Hostname schroeder.debian.org - User madduck - Host powell.debian.org | powell - Hostname powell.debian.org - User madduck - Host rem.debian.org | rem - Hostname rem.debian.org + Host wagner.debian.org | wagner + Hostname wagner.debian.org User madduck - Host smetana.debian.org | smetana - Hostname smetana.debian.org + Host widor.debian.org | widor + Hostname widor.debian.org User madduck - Host bellini.debian.org | bellini - Hostname bellini.debian.org + Host zelenka.debian.org | zelenka + Hostname zelenka.debian.org User madduck Host people.debian.org @@@ -429,6 -373,10 +378,10 @@@ Host clegg-host | clegg-host.madduck.ne 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