Merge branch 'perso' into taf

Conflicts:
	.ssh/config

diff --git a/.gitconfig b/.gitconfig
index 96d880b8362448a175c6bdac1c83eb494201ace4..33f0ed5b9eb69fb76a83543e18a73658e9611ebc 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -39,3 +39,5 @@
        # qu'elle a le même nom.
        # (dans git 2.0, le comportement par défaut deviendra simple)
        default = matching
+[remote-hg]
+       hg-git-compat = true

diff --git a/.ssh/config b/.ssh/config
index f465ad13079c841b6ab9fe09237501a7a3d7a05a..28938119f747f4573a9669a814837693de42f58a 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -312,7 +312,7 @@ Host apprentis munin-apprentis apprentis.crans.org munin-apprentis.crans.org
     HostName apprentis.crans.org
     User legallic
 
-Host asterisk sip stun voip asterisk.crans.org sip.crans.org voip.crans.org stun.crans.org
+Host asterisk.crans.org sip.crans.org voip.crans.org stun.crans.org
     HostName asterisk.crans.org
     User legallic
     ForwardAgent yes
@@ -351,7 +351,7 @@ Host batk-0 batk-0.crans.org
     HostName batk-0.crans.org
     User legallic
 
-Host cas cas-srv auth login cas.crans.org login.crans.org auth.crans.org cas-srv.crans.org
+Host cas-srv cas.crans.org login.crans.org auth.crans.org cas-srv.crans.org
     HostName cas-srv.crans.org
     User legallic
     ForwardAgent yes
@@ -361,7 +361,7 @@ Host cas.adm cas.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host charybde darcs ftp ftp.crans.ens-cachan.fr karibe mirror ntp xn--hxamgu1bpkn charybde.crans.org karibe.crans.org xn--hxamgu1bpkn.crans.org ftp.crans.org mirror.crans.org ftp.crans.ens-cachan.fr ntp.crans.org darcs.crans.org
+Host charybde darcs ftp.crans.ens-cachan.fr xn--hxamgu1bpkn charybde.crans.org karibe.crans.org xn--hxamgu1bpkn.crans.org ftp.crans.org mirror.crans.org ftp.crans.ens-cachan.fr ntp.crans.org darcs.crans.org
     HostName charybde.crans.org
     User legallic
     ForwardAgent yes
@@ -391,7 +391,7 @@ Host cochon.ferme cochon cochon television tv cochon.ferme.crans.org television.
     User legallic
     ForwardAgent yes
 
-Host cups cups.crans.org
+Host cups.crans.org
     HostName cups.crans.org
     User legallic
     ForwardAgent yes
@@ -401,7 +401,7 @@ Host cups.adm cups.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host dhcp dhcp.crans.org
+Host dhcp.crans.org
     HostName dhcp.crans.org
     User legallic
     ForwardAgent yes
@@ -441,7 +441,7 @@ Host ethercalc.adm ethercalc.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host freebox freebox.crans.org
+Host freebox.crans.org
     HostName freebox.crans.org
     User legallic
     ForwardAgent yes
@@ -486,7 +486,7 @@ Host fz.adm fz.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host geet git gitlab geet.crans.org git.crans.org gitlab.crans.org
+Host geet geet.crans.org git.crans.org gitlab.crans.org
     HostName geet.crans.org
     User legallic
     ForwardAgent yes
@@ -506,7 +506,7 @@ Host horde.adm horde.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host irc qwebirc web-irc irc.crans.org qwebirc.crans.org web-irc.crans.org
+Host qwebirc web-irc irc.crans.org qwebirc.crans.org web-irc.crans.org
     HostName irc.crans.org
     User legallic
     ForwardAgent yes
@@ -516,7 +516,7 @@ Host irc.adm irc.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host isc isc.crans.org
+Host isc.crans.org
     HostName isc.crans.org
     User legallic
     ForwardAgent yes
@@ -611,7 +611,7 @@ Host news.adm web-news.adm webnews.adm news.adm.crans.org webnews.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host niomniom 15ans autoconfig autostatus ca crans.ens-cachan.fr crans.org doc i-p install-party map webalizer wifi wiki wikipedia www www.15ans niomniom.crans.org wiki.crans.org www.crans.org install-party.crans.org autostatus.crans.org wifi.crans.org i-p.crans.org crans.org crans.ens-cachan.fr ca.crans.org webalizer.crans.org doc.crans.org map.crans.org wikipedia.crans.org 15ans.crans.org www.15ans.crans.org autoconfig.crans.org
+Host niomniom 15ans crans.ens-cachan.fr crans.org install-party webalizer www.15ans niomniom.crans.org wiki.crans.org www.crans.org install-party.crans.org autostatus.crans.org wifi.crans.org i-p.crans.org crans.org crans.ens-cachan.fr ca.crans.org webalizer.crans.org doc.crans.org map.crans.org wikipedia.crans.org 15ans.crans.org www.15ans.crans.org autoconfig.crans.org
     HostName niomniom.crans.org
     User legallic
     ForwardAgent yes
@@ -666,7 +666,7 @@ Host omnomnom.adm omnomnom.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host owl imap pop owl.crans.org pop.crans.org imap.crans.org
+Host owl owl.crans.org pop.crans.org imap.crans.org
     HostName owl.crans.org
     User legallic
     ForwardAgent yes
@@ -676,7 +676,7 @@ Host owl.adm imap.adm pop.adm owl.adm.crans.org imap.adm.crans.org pop.adm.crans
     User legallic
     ForwardAgent yes
 
-Host owncloud owcloud-srv owncloud.crans.org owncloud-srv.crans.org
+Host owcloud-srv owncloud.crans.org owncloud-srv.crans.org
     HostName owncloud.crans.org
     User legallic
     ForwardAgent yes
@@ -701,12 +701,12 @@ Host pegase pegase.crans.org
     User legallic
     ForwardAgent yes
 
-Host proxy proxy.crans.org
+Host proxy.crans.org
     HostName proxy.crans.org
     User legallic
     ForwardAgent yes
 
-Host puppet puppet.crans.org
+Host puppet.crans.org
     HostName puppet.crans.org
     User legallic
     ForwardAgent yes
@@ -716,7 +716,7 @@ Host puppet.adm puppet.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host redisdead list liste listes lists smtp redisdead.crans.org lists.crans.org smtp.crans.org liste.crans.org listes.crans.org list.crans.org
+Host redisdead redisdead.crans.org lists.crans.org smtp.crans.org liste.crans.org listes.crans.org list.crans.org
     HostName redisdead.crans.org
     User legallic
     ForwardAgent yes
@@ -741,7 +741,7 @@ Host roundcube.adm roundcube.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host routeur deconnexion routeur.crans.org deconnexion.crans.org
+Host deconnexion routeur.crans.org deconnexion.crans.org
     HostName routeur.crans.org
     User legallic
     ForwardAgent yes
@@ -776,7 +776,7 @@ Host soyouz.adm soyoustart.adm soyouz.adm.crans.org soyoustart.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host ssh2 mosh ssh2.crans.org mosh.crans.org
+Host ssh2.crans.org mosh.crans.org
     # Un serveur ssh qui n'est qu'un nat vers 138.231.136.1:22
     # pour passer à travers les blocages de ports (443 = https)
     HostName 138.231.136.2
@@ -809,17 +809,17 @@ Host template.adm template.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host test1 test1.crans.org
+Host test1.crans.org
     HostName test1.crans.org
     User legallic
     ForwardAgent yes
 
-Host test2 test2.crans.org
+Host test2.crans.org
     HostName test2.crans.org
     User legallic
     ForwardAgent yes
 
-Host thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
+Host thot psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
     HostName thot.crans.org
     User legallic
     ForwardAgent yes
@@ -839,7 +839,7 @@ Host titanic.adm titanic.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host tracker tracker todo tracker.crans.org todo.crans.org phabricator phabricattor.crans.org
+Host tracker.crans.org todo.crans.org phabricator phabricattor.crans.org
     HostName tracker.crans.org
     User legallic
     ForwardAgent yes
@@ -884,7 +884,7 @@ Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
     User legallic
     ForwardAgent yes
 
-Host zamok accounts ajaxterm bda-paris bde bleu blogs clubs clubs.ens-cachan.fr factures impression intranet mysql perso pot-vieux ssh www.clubs.ens-cachan.fr zamok.crans.org ssh.crans.org impression.crans.org perso.crans.org clubs.ens-cachan.fr www.clubs.ens-cachan.fr mysql.crans.org bleu.crans.org intranet.crans.org blogs.crans.org bda-paris.crans.org factures.crans.org accounts.crans.org ajaxterm.crans.org clubs.crans.org pot-vieux.crans.org
+Host zamok clubs.ens-cachan.fr www.clubs.ens-cachan.fr zamok.crans.org ssh.crans.org impression.crans.org perso.crans.org clubs.ens-cachan.fr www.clubs.ens-cachan.fr mysql.crans.org bleu.crans.org intranet.crans.org blogs.crans.org bda-paris.crans.org factures.crans.org accounts.crans.org ajaxterm.crans.org clubs.crans.org pot-vieux.crans.org
     HostName zamok.crans.org
     User legallic
     ForwardAgent yes
@@ -1097,3 +1097,14 @@ Host rabban rabban.enst.fr
 
 # END (utile pour éviter les merge conflicts)
 
+# +---------+
+# | Télécom |
+# +---------+
+# Parce que c'est là que je bosse
+
+# Namého !
+Host *
+    ForwardX11 no
+
+# Pas besoin de config spécifique à part ça
+# le ForwardAgent yes est déjà dans /etc/ssh/ssh_config