Commit 6c6a8dae authored by Maxime Bombar's avatar Maxime Bombar

Merge remote-tracking branch 'crans_upstream/master' into upstream

parents 8237320d 64ecabe1
......@@ -168,4 +168,7 @@ alias tailprocmail='tail -f ~/.procmail/logs/procmail.log'
alias a♡tv='cvlc udp://@239.231.140.230:1337'
#Meteo
meteo () { curl wttr.in/`tr -s ' ' '_' <<< "$*"`; }
meteo () { curl fr.wttr.in/`tr -s ' ' '_' <<< "$*"`; }
#Lune
moon () { curl fr.wttr.in/Moon; }
......@@ -668,6 +668,7 @@ shopt -s histappend
# Pour éviter un troll, aucune ligne de cette section n'est décommentée.
# Choisissez la vôtre.
#~# export EDITOR='/usr/bin/nano'
#~# export EDITOR='/usr/bin/vim'
export EDITOR='/usr/bin/emacs'
......
[Desktop Entry]
Type=Application
Name=GPG Password Agent
Name[de]=GPG-Passwort-Agent
Name[en_GB]=GPG Password Agent
Name[es]=Agente de contraseñas GPG
Name[fr]=Agent de mot de passe GPG
Name[it]=Agente password GPG
Comment=GNOME Keyring: GPG Agent
Comment[de]=GNOME-Schlüsselbunddienst: GPG-Agent
Comment[en_GB]=GNOME Keyring: GPG Agent
Comment[es]=Depósito de claves de GNOME: agente GPG
Comment[fr]=Trousseau de clés GNOME : agent GPG
Comment[it]=Portachiavi di GNOME: agente GPG
Exec=/usr/bin/gnome-keyring-daemon --start --components=gpg
OnlyShowIn=GNOME;Unity;
X-GNOME-Autostart-Phase=Initialization
X-GNOME-AutoRestart=false
X-GNOME-Autostart-Notify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-keyring
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=3.4.1
Hidden=true
[Desktop Entry]
Type=Application
Name=SSH Key Agent
Name[de]=SSH-Schlüsselagent
Name[en_GB]=SSH Key Agent
Name[es]=Agente de claves SSH
Name[fr]=Agent de clés SSH
Name[it]=Agente chiavi SSH
Comment=GNOME Keyring: SSH Agent
Comment[de]=GNOME-Schlüsselbunddienst: SSH-Agent
Comment[en_GB]=GNOME Keyring: SSH Agent
Comment[es]=Depósito de claves de GNOME: agente SSH
Comment[fr]=Trousseau de clés GNOME : agent SSH
Comment[it]=Portachiavi di GNOME: agente SSH
Exec=/usr/bin/gnome-keyring-daemon --start --components=ssh
OnlyShowIn=GNOME;Unity;
X-GNOME-Autostart-Phase=Initialization
X-GNOME-AutoRestart=false
X-GNOME-Autostart-Notify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-keyring
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=3.4.1
Hidden=true
......@@ -41,7 +41,17 @@
# (dans git 2.0, le comportement par défaut deviendra simple)
default = matching
[log]
decorate = true
graph = true
[core]
editor = emacs
# Afficher les têtes des branches
decorate = true
# Afficher la version courtes des hash de commit
abbrevCommit = true
[alias]
# Raccourci pour afficher toutes les branches.
lg = log --graph
......@@ -52,6 +52,7 @@ club.astro
detenste
eurovisioens
fensfoire
henstai
impro
jonglage
k-dens
......
# .profile générique mis à votre disposition
# par les gentils membres actifs du Cr@ns
# Vous pouvez l'utiliser, le redistribuer, le modifier à votre convenance.
# Des questions, des suggestions : {nounou,ca}@lists.crans.org
# Licence : WTFPL
# Les sections commentées par #~# sont des features qui ne sont pas activées
# par défaut. Sentez-vous libre de les décommenter pour les utiliser.
#------------------------------------------------------------------------------
# Si le shell est bash, lire le fichier de configuration (s'il existe)
if [ -n "$BASH_VERSION" ]; then
# include .bashrc if it exists
if [ -f "$HOME/.bashrc" ]; then
. "$HOME/.bashrc"
fi
fi
# Si on a un dossier ~/bin, l'ajouter à la liste des dossiers
# dans lesquels le shell cherche les commandes
if [ -d "$HOME/bin" ] ; then
PATH="$HOME/bin:$PATH"
fi
......@@ -20,9 +20,3 @@ caption always "%{+u wk}%?%-w%?%{yk}/%n %t\%{wk}%?%+w%?"
# UTF8 par défaut
defutf8 on
# 256 couleurs, parce que c'est mieux
term "xterm-color"
termcap xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
terminfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
This diff is collapsed.
This diff is collapsed.
# .ssh/config_bde pour les serveurs du BDE mis à votre disposition
# par les gentils membres actifs du Cr@ns
# Vous pouvez l'utilisez, le redistribuer, le modifier à votre convenance.
# Des questions, des suggestions : {nounou,ca}@lists.crans.org
# Typiquement, vous pouvez proposer d'ajouter la conf pour accéder à votre département
# Licence : WTFPL
#
# Pensez à remplacer "loginBDE" par les logins idoines.
# 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
# .ssh/config_crans pour les serveurs du Crans mis à votre disposition
# par les gentils membres actifs du Cr@ns
# Vous pouvez l'utilisez, le redistribuer, le modifier à votre convenance.
# Des questions, des suggestions : {nounou,ca}@lists.crans.org
# Typiquement, vous pouvez proposer d'ajouter la conf pour accéder à votre département
# Licence : WTFPL
#
# Pensez à remplacer "loginCr@ns" par les logins idoines.
# +-------------------+
# | Serveurs du Cr@ns |
# +-------------------+
# Accessible aux apprentis
# sauf zamok et ssh2, accessibles à tous les adhérents
Host alice alice.crans.org
HostName alice.crans.org
User loginCr@ns
ForwardAgent yes
Host alice.adm alice.adm.crans.org
HostName alice.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host apprentis apprentis.crans.org
HostName apprentis.crans.org
User loginCr@ns
Host backbone backbone.crans.org
HostName backbone.crans.org
User loginCr@ns
ForwardAgent yes
Host bakdaur bakdaur.crans.org
HostName bakdaur.crans.org
User loginCr@ns
ForwardAgent yes
Host bakdaur.adm bakdaur.adm.crans.org
HostName bakdaur.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host backbone.wifi backbone.wifi.crans.org
HostName backbone.wifi.crans.org
User loginCr@ns
ForwardAgent yes
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
ForwardAgent yes
Host cas.adm cas.adm.crans.org
HostName cas.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host charybde 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
HostName charybde.crans.org
User loginCr@ns
ForwardAgent yes
Host charybde.adm ftp.adm mirror.adm ntp.adm charybde.adm.crans.org ftp.adm.crans.org mirror.adm.crans.org ntp.adm.crans.org
HostName charybde.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host civet rabbitmq vvvvvv civet.crans.org vvvvvv.crans.org rabbitmq.crans.org
HostName civet.crans.org
User loginCr@ns
ForwardAgent yes
Host civet.adm rabbitmq.adm civet.adm.crans.org rabbitmq.adm.crans.org
HostName civet.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host cochon cochon.ferme television tv cochon.ferme.crans.org television.crans.org tv.crans.org cochon.crans.org
HostName cochon.crans.org
User loginCr@ns
ForwardAgent yes
Host cochon.adm cochon.adm.crans.org
HostName cochon.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host cups.adm cups.adm.crans.org
HostName cups.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host dhcp dhcp.crans.org
HostName dhcp.crans.org
User loginCr@ns
ForwardAgent yes
Host dhcp-21 dhcp-21.crans.org
HostName dhcp-21.crans.org
User loginCr@ns
ForwardAgent yes
Host dhcp.adm dhcp.adm.crans.org
HostName dhcp.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host digicode-4j digicode-4j.crans.org
HostName digicode-4j.crans.org
User loginCr@ns
ForwardAgent yes
Host digicode-4j.adm digicode-4j.adm.crans.org
HostName digicode-4j.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host ethercalc ethercalc-srv ethercalc.crans.org ethercalc-srv.crans.org
HostName ethercalc-srv.crans.org
User loginCr@ns
ForwardAgent yes
Host ethercalc.adm ethercalc.adm.crans.org
HostName ethercalc.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host freebox freebox.crans.org
HostName freebox.crans.org
User loginCr@ns
ForwardAgent yes
Host frontdaur frontdaur.crans.org
HostName frontdaur.crans.org
User loginCr@ns
ForwardAgent yes
Host frontdaur.adm frontdaur.adm.crans.org
HostName frontdaur.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host ft ft.crans.org
HostName ft.crans.org
User loginCr@ns
ForwardAgent yes
Host ft.adm ft.adm.crans.org
HostName ft.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host fy munin icinga2 weathermap fy.crans.org munin.crans.org icinga2.crans.org weathermap.crans.org
HostName fy.crans.org
User loginCr@ns
ForwardAgent yes
Host fy.adm fy.adm.crans.org
HostName fy.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host fz fz.crans.org
HostName fz.crans.org
User loginCr@ns
ForwardAgent yes
Host fz.adm fz.adm.crans.org
HostName fz.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host jitsi jitsi.crans.org
HostName jitsi.crans.org
User loginCr@ns
ForwardAgent yes
Host jitsi.adm jitsi.adm.crans.org
HostName jitsi.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host geet git gitlab geet.crans.org git.crans.org gitlab.crans.org
HostName geet.crans.org
User loginCr@ns
ForwardAgent yes
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
ForwardAgent yes
Host ipv6 ipv6.crans.org
HostName ipv6.crans.org
User loginCr@ns
ForwardAgent yes
Host ipv6.adm ipv6.adm.crans.org
HostName ipv6.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host irc qwebirc web-irc irc.crans.org qwebirc.crans.org web-irc.crans.org
HostName irc.crans.org
User loginCr@ns
ForwardAgent yes
Host irc.adm irc.adm.crans.org
HostName irc.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host kenobi pad pastebin zero kenobi.crans.org pad.crans.org zero.crans.org pastebin.crans.org
HostName kenobi.crans.org
User loginCr@ns
ForwardAgent yes
Host kenobi.adm kenobi.adm.crans.org
HostName kenobi.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host komaz komaz.crans.org
HostName komaz.crans.org
User loginCr@ns
ForwardAgent yes
Host komaz.adm komaz.adm.crans.org
HostName komaz.adm.crans.org
User loginCr@ns
ForwardAgent yes
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
ForwardAgent yes
Host mediadrop.adm mediadrop.adm.crans.org
HostName mediadrop.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host nem nem.crans.org
HostName nem.crans.org
User loginCr@ns
ForwardAgent yes
Host nem.adm nem.adm.crans.org
HostName nem.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host news web-news webnews news.crans.org web-news.crans.org webnews.crans.org
HostName news.crans.org
User loginCr@ns
ForwardAgent yes
Host news.adm web-news.adm webnews.adm news.adm.crans.org webnews.adm.crans.org web-news.adm.crans.org
HostName news.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host niomniom 15ans autoconfig autostatus crans.ens-cachan.fr crans.org doc i-p install-party 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 doc.crans.org wikipedia.crans.org 15ans.crans.org www.15ans.crans.org autoconfig.crans.org
HostName niomniom.crans.org
User loginCr@ns
ForwardAgent yes
Host niomniom.adm niomniom.adm.crans.org
HostName niomniom.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host o2 intranet2 switchs o2.crans.org switchs.crans.org intranet2.crans.org
HostName o2.crans.org
User loginCr@ns
ForwardAgent yes
Host o2.adm o2.adm.crans.org
HostName o2.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host odlyd odlyd.crans.org
HostName odlyd.crans.org
User loginCr@ns
ForwardAgent yes
Host odlyd.adm upload.adm odlyd.adm.crans.org upload.adm.crans.org
HostName odlyd.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host odlyd.wifi odlyd.wifi.crans.org
HostName odlyd.wifi.crans.org
User loginCr@ns
ForwardAgent yes
Host omnomnom omnomnom.crans.org
HostName omnomnom.crans.org
User loginCr@ns
ForwardAgent yes
Host omnomnom.adm omnomnom.adm.crans.org
HostName omnomnom.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host owl imap pop owl.crans.org pop.crans.org imap.crans.org
HostName owl.crans.org
User loginCr@ns
ForwardAgent yes
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
ForwardAgent yes
Host owncloud owcloud-srv owncloud.crans.org owncloud-srv.crans.org
HostName owncloud-srv.crans.org
User loginCr@ns
ForwardAgent yes
Host owncloud.adm owncloud.adm.crans.org
HostName owncloud.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host pea pea.crans.org
HostName pea.crans.org
User loginCr@ns
ForwardAgent yes
Host pea.adm pea.adm.crans.org
HostName pea.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host proxy proxy.crans.org
HostName proxy.crans.org
User loginCr@ns
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
HostName redisdead.crans.org
User loginCr@ns
ForwardAgent yes
Host redisdead.adm list.adm liste.adm listes.adm lists.adm smtp.adm redisdead.adm.crans.org lists.adm.crans.org smtp.adm.crans.org listes.adm.crans.org list.adm.crans.org liste.adm.crans.org
HostName redisdead.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host routeur deconnexion routeur.crans.org deconnexion.crans.org
HostName routeur.crans.org
User loginCr@ns
ForwardAgent yes
Host routeur.adm routeur.adm.crans.org
HostName routeur.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host routeur-21 routeur-21.crans.org
HostName routeur-21.crans.org
User loginCr@ns
ForwardAgent yes
Host sable sable.crans.org
HostName sable.crans.org
User loginCr@ns
ForwardAgent yes
Host sable.adm sable.adm.crans.org
HostName sable.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host silice silice.crans.org
HostName silice.crans.org
User loginCr@ns
ForwardAgent yes
Host silice.adm silice.adm.crans.org
HostName silice.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host soyouz soyoustart soyouz.crans.org soyoustart.crans.org
HostName soyouz.crans.org
User loginCr@ns
ForwardAgent yes
Host soyouz.adm soyoustart.adm soyouz.adm.crans.org soyoustart.adm.crans.org
HostName soyouz.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host ssh2 mosh 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
Port 443
User loginCr@ns
ForwardAgent yes
Host stitch stitch.crans.org
HostName stitch.crans.org
User loginCr@ns
ForwardAgent yes
Host stitch.adm stitch.adm.crans.org
HostName stitch.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host stun-secondary stun-secondary.crans.org
HostName stun-secondary.crans.org
User loginCr@ns
ForwardAgent yes
Host thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
HostName thot.crans.org
User loginCr@ns
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
HostName thot.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host titanic titanic.crans.org
HostName titanic.crans.org
User loginCr@ns
ForwardAgent yes
Host titanic.adm titanic.adm.crans.org
HostName titanic.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host unifi unifi.crans.org
HostName unifi.crans.org
User loginCr@ns
ForwardAgent yes
Host unifi.adm unifi.adm.crans.org
HostName unifi.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host phabricator todo tracker.adm tracker.adm.crans.org
HostName tracker.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host vo calendrier intranet-dev news-dev openid-dev weavesync vo.crans.org weavesync.crans.org intranet-dev.crans.org calendrier.crans.org openid-dev.crans.org news-dev.crans.org
HostName vo.crans.org
User loginCr@ns
ForwardAgent yes
Host vo-eth0 vo-eth0.crans.org
HostName vo-eth0.crans.org
User loginCr@ns
ForwardAgent yes
Host vo.adm vo.adm.crans.org
HostName vo.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host vulcain vulcain.crans.org
HostName vulcain.crans.org
User loginCr@ns
ForwardAgent yes
Host vulcain.adm vulcain.adm.crans.org
HostName vulcain.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host xmpp aim conference conference.jabber icq jabber xmpp.crans.org icq.crans.org aim.crans.org conference.crans.org jabber.crans.org yahoo.crans.org chat.yahoo.crans.org conference.jabber.crans.org
HostName xmpp.crans.org
User loginCr@ns
ForwardAgent yes
Host xmpp.adm jabber.adm xmpp.adm.crans.org jabber.adm.crans.org
HostName xmpp.adm.crans.org
User loginCr@ns
ForwardAgent yes
Host ytrap-llatsni ytrap-llatsni.crans.org
HostName ytrap-llatsni.crans.org
User loginCr@ns
ForwardAgent yes
Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
HostName ytrap-llatsni.adm.crans.org
User loginCr@ns
ForwardAgent yes