From: Vincent Le Gallic Date: Tue, 7 Jun 2016 01:05:35 +0000 (+0200) Subject: Merge branch 'master' into perso X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=0a492655b7e30ab9949bbfe0d76955fa125eecba;p=config-20-100.git Merge branch 'master' into perso Conflicts: .ssh/config .vimrc --- 0a492655b7e30ab9949bbfe0d76955fa125eecba diff --cc .ssh/config index 96ca582,f37f880..271af7a --- a/.ssh/config +++ b/.ssh/config @@@ -48,241 -49,44 +49,222 @@@ ServerAliveCountMax # ProxyCommand = pour passer par un autre serveur intermédiaire # (pour un serveur qui ne peut pas être contacté directement) -#~# # +-----------------+ -#~# # | Serveurs du BDE | -#~# # +-----------------+ -#~# # Serveurs du BDE accessibles aux respos info -#~# -#~# Host kfet kfet.crans.org kfet1 -#~# HostName kfet.crans.org -#~# User bde -#~# -#~# Host kfet-bureau kfet-bureau.crans.org -#~# HostName kfet.crans.org -#~# User bde -#~# -#~# Host bde2 bde2-virt note note-virt kfet-ics doc-bde ldap-bde bde2.crans.org bde2-virt.crans.org note.crans.org -#~# HostName bde2-virt.crans.org -#~# User loginBDE -#~# ForwardAgent yes -#~# -#~# Host bde3-virt digicode bde3-virt.crans.org -#~# HostName bde3-virt.crans.org -#~# User loginBDE -#~# ForwardAgent yes -#~# -#~# Host bde3 bde3.crans.org -#~# HostName bde3.crans.org -#~# User loginBDE -#~# ForwardAgent yes -#~# -#~# Host bde-test bde-test-virt note-test note-dev bde-test.crans.org bde-test-virt.crans.org note-test.crans.org -#~# HostName bde-test-virt.crans.org -#~# User loginBDE -#~# ForwardAgent yes -#~# -#~# Host sauron sauron.crans.org -#~# HostName sauron.crans.org -#~# User loginBDE -#~# ForwardAgent yes +UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts_crans ~/.ssh/known_hosts_dptinfo + +# +--------------+ +# | Mes machines | +# +--------------+ + +Host cerebro.crans.org cerebro + HostName cerebro.crans.org + User vincent + ForwardAgent yes + +Host eva.crans.org eva eeepc + HostName eva.crans.org + User vincent + ForwardAgent yes + +Host eva.local + HostName 192.168.1.12 + User vincent + ForwardAgent yes + +Host evaw.local + HostName 192.168.1.29 + User vincent + ForwardAgent yes + +Host eva.home evaf + HostName 192.168.1.12 + User vincent + ForwardAgent yes + ProxyCommand ssh home.b2moo.fr -W %h:%p + +Host evaw.home evaw + HostName 192.168.1.29 + User vincent + ForwardAgent yes + ProxyCommand ssh home.b2moo.fr -W %h:%p + +Host cabal.crans.org cabal.crans + HostName cabal.crans.org + User vincent + ForwardAgent yes + +Host cabal.local + HostName 192.168.1.81 + User vincent + ForwardAgent yes + +Host cabalw.local + HostName 192.168.1.63 + User vincent + ForwardAgent yes + +Host cabal.home cabal + HostName 192.168.1.81 + User vincent + ForwardAgent yes + ProxyCommand ssh home.b2moo.fr -W %h:%p + +Host cabalw.home cabalw + HostName 192.168.1.63 + User vincent + ForwardAgent yes + ProxyCommand ssh home.b2moo.fr -W %h:%p + +Host viki viki.wifi viki.wifi.crans.org + HostName viki.wifi.crans.org + User root + Port 2222 + +Host gladys home colloc home.b2moo.fr + HostName home.b2moo.fr + User vincent + ForwardAgent yes + +Host gladys.local + HostName 192.168.1.18 + User vincent + ForwardAgent yes + +# Les bots sur cerebro +Host basile + HostName cerebro.crans.org + User basile + ForwardAgent yes +Host note-cerebro + HostName cerebro.crans.org + User note + ForwardAgent yes +Host deconnaisseur + HostName cerebro.crans.org + User deconnaisseur + ForwardAgent yes +Host pendu Hung hung + HostName cerebro.crans.org + User hung + ForwardAgent yes +Host historien + HostName cerebro.crans.org + User historien + ForwardAgent yes +Host salesman Salesman + HostName cerebro.crans.org + User salesman + ForwardAgent yes +Host themis Themis + HostName cerebro.crans.org + User themis + ForwardAgent yes +Host saturnin Saturnin + HostName cerebro.crans.org + User saturnin + ForwardAgent yes +Host ibot iBot + HostName cerebro.crans.org + User ibot + ForwardAgent yes + + +# +--------+ +# | Pimeys | +# +--------+ +# Serveur dédié online.net +# pimeys.fr = 62.210.178.115 + +Host pimeys pimeys.fr becue.eu + HostName pimeys.fr + User vincent + ForwardAgent yes + + - # +-----------------+ - # | Machines du BDE | - # +-----------------+ - # Parce que j'étais respo-info Makiavé[list] - - Host kfet kfet.crans.org - HostName kfet.crans.org - User bde - # IPv4 only - AddressFamily inet - ForwardAgent yes - - Host kfet-secours kfet-secours.crans.org - HostName kfet-secours.crans.org - User bde - # IPv4 only - AddressFamily inet - - Host kfet2 kfet2.crans.org - HostName kfet2.crans.org - User vincent - - Host bde-test note-test bde-test.crans.org note-test.crans.org - HostName bde-test.crans.org - User vincent - ForwardAgent yes - - Host bde2 bde-fallback bde2.crans.org ldap-bde.crans.org bde-fallback.crans.org - HostName bde2.crans.org - User vincent - ForwardAgent yes - - Host bde3 bde3.crans.org - HostName bde3.crans.org - User vincent - ForwardAgent yes - - Host note bde2-virt bde ldap-bde note.crans.ort bde2-virt.crans.org bde.crans.org - HostName bde2-virt.crans.org - User vincent - ForwardAgent yes - - Host note bde3-virt bde note.crans.ort bde3-virt.crans.org bde.crans.org - HostName bde3-virt.crans.org - User vincent - ForwardAgent yes - - Host video videobde videobde.crans.org - HostName videobde.crans.org - User vincent - ForwardAgent yes - - Host bureau bureau-bde bureau-bde.crans.org - HostName bureau-bde.crans.org - User bde - - Host med zavoyarde med.crans.org zavoyarde.crans.org - HostName zavoyarde.crans.org - User vincent - +# +----+ +# | PE | +# +----+ +# Parce que j'y suis le bienvenu + +Host linkki linkki.crans.org + HostName linkki.crans.org + User sword + +Host ilma ilma.wifi ilma.wifi.crans.org + HostName ilma.wifi.crans.org + User sword + +Host ruoska ruoska.crans.org + HostName ruoska.crans.org + User vincent + + +# +-----+ +# | Nit | +# +-----+ +# Parce que j'y suis le bienvenu + - # Le ftp de Nit, gère A♡-TV. ++# Le ftp de Nit +Host power power.crans.org nit-git nit-git.crans.org + HostName power.crans.org + User vincent + - # Réplicat du wikoeur - Host genua acoeur.genua.fr - HostName acoeur.genua.fr - User root - AddressFamily inet6 + +# +----+ +# | A♡ | +# +----+ +# Parce que le département A♡ a un serveur + +Host acoeur acoeur.crans.org + HostName acoeur.crans.org + User vincent + ForwardAgent yes + ++ ++# +-----------------+ ++# | Serveurs du BDE | ++# +-----------------+ ++# Serveurs du BDE accessibles aux respos info ++ ++Host kfet kfet.crans.org kfet1 ++ HostName kfet.crans.org ++ User bde ++ ForwardAgent yes ++ ++Host kfet-bureau kfet-bureau.crans.org bureau bureau-bde ++ HostName kfet.crans.org ++ User bde ++ ForwardAgent yes ++ ++Host bde2 bde2-virt note note-virt kfet-ics doc-bde ldap-bde bde2.crans.org bde2-virt.crans.org note.crans.org ++ HostName bde2-virt.crans.org ++ User vincent ++ ForwardAgent yes ++ ++Host bde3-virt digicode bde3-virt.crans.org ++ HostName bde3-virt.crans.org ++ User vincent ++ ForwardAgent yes ++ ++Host bde3 bde3.crans.org ++ HostName bde3.crans.org ++ User vincent ++ ForwardAgent yes ++ ++Host bde-test bde-test-virt note-test note-dev bde-test.crans.org bde-test-virt.crans.org note-test.crans.org ++ HostName bde-test-virt.crans.org ++ User vincent ++ ForwardAgent yes ++ ++Host sauron sauron.crans.org ++ HostName sauron.crans.org ++ User vincent ++ ForwardAgent yes ++ ++Host med zavoyarde med.crans.org zavoyarde.crans.org ++ HostName zavoyarde.crans.org ++ User vincent ++ + # +-------------------+ # | Serveurs du Cr@ns | # +-------------------+ @@@ -325,21 -129,31 +307,31 @@@ Host backbone backbone.crans.or Host backbone.adm backbone.adm.crans.org HostName backbone.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes + Host bakdaur bakdaur.crans.org + HostName bakdaur.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + + Host bakdaur.adm bakdaur.adm.crans.org + HostName bakdaur.adm.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + Host backbone.wifi backbone.wifi.crans.org HostName backbone.wifi.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host batk-0 batk-0.crans.org HostName batk-0.crans.org - User loginCr@ns + User legallic - Host cas auth login cas.crans.org login.crans.org auth.crans.org - HostName cas.crans.org + Host cas cas-srv auth login cas.crans.org login.crans.org auth.crans.org cas-srv.crans.org + HostName cas-srv.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host cas.adm cas.adm.crans.org @@@ -399,22 -213,27 +391,27 @@@ Host dhcp-21 dhcp-21.crans.or Host dhcp.adm dhcp.adm.crans.org HostName dhcp.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes + Host discourse discourse-srv discourse.crans.org discourse-srv.crans.org + HostName discourse-srv.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + Host dyson dyson.crans.org HostName dyson.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host dyson.adm munin.adm dyson.adm.crans.org munin.adm.crans.org HostName dyson.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host ethercalc ethercalc.crans.org - HostName ethercalc.crans.org + Host ethercalc ethercalc-srv ethercalc.crans.org ethercalc-srv.crans.org + HostName ethercalc-srv.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host ethercalc.adm ethercalc.adm.crans.org @@@ -424,22 -243,32 +421,32 @@@ Host freebox freebox.crans.org HostName freebox.crans.org - User loginCr@ns + User legallic ForwardAgent yes + Host frontdaur frontdaur.crans.org + HostName frontdaur.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + + Host frontdaur.adm frontdaur.adm.crans.org + HostName frontdaur.adm.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + Host ft ft.crans.org HostName ft.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host ft.adm ft.adm.crans.org HostName ft.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host fy munin fy.crans.org munin.crans.org + Host fy munin icinga2 weathermap fy.crans.org munin.crans.org icinga2.crans.org weathermap.crans.org HostName fy.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host fy.adm fy.adm.crans.org @@@ -464,12 -293,12 +471,12 @@@ Host geet git gitlab geet.crans.org git Host geet.adm git.adm gitlab.adm geet.adm.crans.org git.adm.crans.org gitlab.adm.crans.org HostName geet.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host horde webmail horde.crans.org webmail.crans.org + Host horde horde-srv webmail horde.crans.org horde-srv.crans.org webmail.crans.org - HostName horde-srv.crans.org - User loginCr@ns + HostName horde.crans.org + User legallic ForwardAgent yes Host horde.adm horde.adm.crans.org @@@ -539,12 -368,12 +546,12 @@@ Host malloc malloc.crans.or Host malloc.adm malloc.adm.crans.org HostName malloc.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host mediadrop video mediadrop.crans.org video.crans.org + Host mediadrop mediadrop-srv video mediadrop.crans.org video.crans.org mediadrop-srv.crans.org video-srv.crans.org - HostName mediadrop-srv.crans.org - User loginCr@ns + HostName mediadrop.crans.org + User legallic ForwardAgent yes Host mediadrop.adm mediadrop.adm.crans.org @@@ -644,12 -473,12 +651,12 @@@ Host owl imap pop owl.crans.org pop.cra Host owl.adm imap.adm pop.adm owl.adm.crans.org imap.adm.crans.org pop.adm.crans.org HostName owl.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host owncloud owncloud.crans.org + Host owncloud owcloud-srv owncloud.crans.org owncloud-srv.crans.org - HostName owncloud-srv.crans.org - User loginCr@ns + HostName owncloud.crans.org + User legallic ForwardAgent yes Host owncloud.adm owncloud.adm.crans.org @@@ -669,12 -498,17 +676,17 @@@ Host pea.adm pea.adm.crans.or Host pegase pegase.crans.org HostName pegase.crans.org - User loginCr@ns + User legallic ForwardAgent yes + Host proxy proxy.crans.org + HostName proxy.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + Host puppet puppet.crans.org HostName puppet.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host puppet.adm puppet.adm.crans.org @@@ -719,22 -553,22 +731,22 @@@ Host routeur-21 routeur-21.crans.or Host routeur.adm routeur.adm.crans.org HostName routeur.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host sable dns proxy sable.crans.org proxy.crans.org dns.crans.org + Host sable dns sable.crans.org dns.crans.org HostName sable.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host sable.adm proxy.adm sable.adm.crans.org proxy.adm.crans.org HostName sable.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host sogo sogo.crans.org + Host sogo sogo-srv sogo.crans.org sogo-srv.crans.org - HostName sogo-srv.crans.org - User loginCr@ns + HostName sogo.crans.org + User legallic ForwardAgent yes Host sogo.adm sogo.adm.crans.org @@@ -757,12 -591,22 +769,22 @@@ Host ssh2 mosh ssh2.crans.org mosh.cran # pour passer à travers les blocages de ports (443 = https) HostName 138.231.136.2 Port 443 - User loginCr@ns + User legallic ForwardAgent yes + Host stitch stitch.crans.org + HostName stitch.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + + Host stitch.adm stitch.adm.crans.org + HostName stitch.adm.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + Host stun-secondary stun-secondary.crans.org HostName stun-secondary.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host template template.crans.org @@@ -772,12 -616,22 +794,22 @@@ Host template.adm template.adm.crans.org HostName template.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes + Host test1 test1.crans.org + HostName test1.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + + Host test2 test2.crans.org + HostName test2.crans.org - User loginCr@ns ++ User legallic + ForwardAgent yes + Host thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org HostName thot.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host thot.adm logs.adm pgsql.adm psuornotpsu.adm thot.adm.crans.org psuornotpsu.adm.crans.org pgsql.adm.crans.org logs.adm.crans.org @@@ -792,12 -646,12 +824,12 @@@ Host titanic titanic.crans.or Host titanic.adm titanic.adm.crans.org HostName titanic.adm.crans.org - User loginCr@ns + User legallic ForwardAgent yes - Host tracker todo tracker.crans.org todo.crans.org + Host tracker tracker todo tracker.crans.org todo.crans.org phabricator phabricattor.crans.org HostName tracker.crans.org - User loginCr@ns + User legallic ForwardAgent yes Host tracker.adm tracker.adm.crans.org @@@ -995,74 -834,35 +1027,74 @@@ Host tselin Host tahines.ens-cachan.fr tahines2 tahines HostName tahines.ens-cachan.fr - User loginENS - - -#~# # +------------------+ -#~# # | Département info | -#~# # +------------------+ -#~# # Machines du département informatique de l'ENSC -#~# # Accesibles aux A0 -#~# -#~# Host info21 infossh ssh.dptinfo ssh.dptinfo.ens-cachan.fr -#~# #HostName 138.231.36.60 -#~# HostName ssh.dptinfo.ens-cachan.fr -#~# User loginENS -#~# ForwardAgent yes -#~# -#~# # Le ! permet de ne pas capturer ssh.dptinfo dans *.dptinfo -#~# # Sinon on crée une boucle -#~# Host *.dptinfo !ssh.dptinfo -#~# HostName %h.ens-cachan.fr -#~# User loginENS -#~# ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p -#~# ForwardAgent yes -#~# -#~# Host *.dptinfo.ens-cachan.fr !ssh.dptinfo.ens-cachan.fr -#~# HostName %h -#~# User loginENS -#~# ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p -#~# ForwardAgent yes + User vlegalli + + +# +------------------+ +# | Département info | +# +------------------+ +# Machines du département informatique de l'ENSC +# Accesibles aux A0 + +Host info21 infossh ssh.dptinfo ssh.dptinfo.ens-cachan.fr + #HostName 138.231.36.60 + HostName ssh.dptinfo.ens-cachan.fr + User vlegalli + ForwardAgent yes + +# Le ! permet de ne pas capturer ssh.dptinfo dans *.dptinfo +# Sinon on crée une boucle +Host *.dptinfo !ssh.dptinfo + HostName %h.ens-cachan.fr + User vlegalli + ProxyCommand ssh vlegalli@ssh.dptinfo.ens-cachan.fr -W %h:%p + ForwardAgent yes + +Host *.dptinfo.ens-cachan.fr !ssh.dptinfo.ens-cachan.fr + HostName %h + User vlegalli - ProxyCommand ssh loginENS@ssh.dptinfo.ens-cachan.fr -W %h:%p ++ ProxyCommand ssh vlegalli@ssh.dptinfo.ens-cachan.fr -W %h:%p + ForwardAgent yes + + +# +--------+ +# | Stages | +# +--------+ + +Host mars mars.lbpa mars.lbpa.ens-cachan.fr + HostName mars.lbpa.ens-cachan.fr + User vincent + ProxyCommand ssh vlegalli@tahines.ens-cachan.fr -W %h:%p +# +------+ +# | Labo | +# +------+ + +# Homes montées mais != passerelle +Host lri acces.lri ssh.lri acces.lri.fr + HostName acces.lri.fr + User legallic + ForwardAgent yes + +# Passerelle d'entrée, utilisable que par clé +Host pl-ssh pl-ssh.lri.fr + HostName pl-ssh.lri.fr + PasswordAuthentication no + User legallic + ForwardAgent yes + +Host labo lri30-13 lri30-13.lri.fr + HostName lri30-13.lri.fr + User legallic + ForwardAgent yes + ProxyCommand ssh pl-ssh.lri.fr -W %h:%p + +Host hal hal.labo 129.175.30.228 + HostName 129.175.30.228 + User vincent + ForwardAgent yes + ProxyCommand ssh pl-ssh.lri.fr -W %h:%p + # END (utile pour éviter les merge conflicts) diff --cc .vimrc index 31f939a,fa71e52..304b438 --- a/.vimrc +++ b/.vimrc @@@ -23,8 -23,11 +23,11 @@@ set titl "~" " N'affiche pas sur plusieurs lignes les lignes qui sont plus grandes que la fenêtre (comme sous nano) "~" set nowrap -"~" " Montre brièvement la paire de parenthèse lors de sa fermeture -"~" set showmatch ++" Montre brièvement la paire de parenthèse lors de sa fermeture ++set showmatch + -"~" " Optimise la coloration de vim pour l'adapter à un terminal sombre (par défaut 'light') -"~" set background=dark +" Optimise la coloration de vim pour l'adapter à un terminal sombre (par défaut 'light') +set background=dark " ~~ Numérotation ~~ " Affiche 'ligne,n de caractère,colonne' en bas à droite du terminal @@@ -42,18 -50,26 +50,26 @@@ set numberwidth= " +-----------------+ " ~~ Coloration syntaxique ~~ - " Active la coloration syntaxique - syntax on + " Active la coloration syntaxique pour le type de fichier détecté + if has("syntax") + syntax on + endif " ~~ Indentation et tabulation ~~ + " Active les régles d'indentation pour le type de fichier détecté + if has("autocmd") + filetype plugin indent on + endif + -"~" " Conserve l'indentation de la ligne précédente lors d'un retour à la ligne -"~" set autoindent +" Conserve l'indentation de la ligne précédente lors d'un retour à la ligne +set autoindent -"~" " Met les tabulations à 4 colonnes -"~" set tabstop=4 +" Met les tabulations à 4 colonnes +set tabstop=4 -"~" " Indente à 4 colonnes pour les opérations de réindentation -"~" set shiftwidth=4 -"~" set shiftwidth=4 " pour <<, >> et == +" Indente à 4 colonnes pour les opérations de réindentation +set shiftwidth=4 ++set shiftwidth=4 " pour <<, >> et == "~" " Remplace les (futures) tabulations par des espaces "~" set expandtab