Commit 5f7a27c5 authored by Boudy's avatar Boudy

Merge gitzly.crans.org:membres-actifs/fichiers_configuration

parents a5533d71 7fbfc3fb
! Exange Esc and Caps_Lock
clear Lock
keysym Caps_Lock = Escape
keysym Escape = Caps_Lock
add Lock = Caps_Lock
......@@ -32,9 +32,9 @@ fi
# Bash-complétion
[ -f /etc/bash_completion ] && . /etc/bash_completion
# Placez vos fichiers de bash-complétion custom dans ~/.bash_completion.d/
# Placez vos fichiers de bash-complétion custom dans ~/.bash/completion.d/
# ils seront chargés par la ligne suivante
[ -d ~/.bash_completion.d/ ] && for f in ~/.bash_completion.d/*; do source $f; done
[ -d ~/.bash/completion.d/ ] && for f in ~/.bash/completion.d/*; do source $f; done
# +-----+
# | VCS |
......@@ -640,7 +640,10 @@ function welcome_message ()
# comme ils n'utilisent pas le même format pour stocker le timestamp
# des commandes, on se retrouve avec des comportements non souhaités
# si on ne change pas le fichier d'historique entre les deux.
export HISTFILE=~/.bash_history
export HISTFILE=~/.bash/history/$HOSTNAME
if [ ! -d ~/.bash/history ]; then
mkdir -p ~/.bash/history
fi
# On ne sauve pas les lignes dupliquées qui se suivent dans l'historique
# ainsi que les commandes qui commencent par une espace
......@@ -688,15 +691,17 @@ PATH=~/bin:$PATH:/sbin:/usr/sbin
# +----------+
# Chargement des alias
if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases
if [ -f ~/.bash/aliases ]; then
. ~/.bash/aliases
fi
# Fichier locaux (utile quand on clone sa config sur plusieurs machines)
[[ -f ~/.bashrc.local ]] && . ~/.bashrc.local
if [ -f ~/.bash/bashrc.local ]; then
. ~/.bash/bashrc.local
fi
if [ -f ~/.bash_aliases_local ]; then
. ~/.bash_aliases_local
if [ -f ~/.bash/aliases_local ]; then
. ~/.bash/aliases_local
fi
if [ -f ~/.bash_colors ]; then
......
......@@ -33,6 +33,11 @@ Host backbone backbone.crans.org
User lebouder
ForwardAgent yes
Host backbone.wifi backbone.wifi.crans.org
HostName backbone.wifi.crans.org
User lebouder
ForwardAgent yes
Host bakdaur bakdaur.crans.org
HostName bakdaur.crans.org
User lebouder
......@@ -43,11 +48,6 @@ Host bakdaur.adm bakdaur.adm.crans.org
User lebouder
ForwardAgent yes
Host backbone.wifi backbone.wifi.crans.org
HostName backbone.wifi.crans.org
User lebouder
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 lebouder
......@@ -58,7 +58,7 @@ Host cas.adm cas.adm.crans.org
User lebouder
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
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
HostName charybde.crans.org
User lebouder
ForwardAgent yes
......@@ -78,31 +78,11 @@ Host civet.adm rabbitmq.adm civet.adm.crans.org rabbitmq.adm.crans.org
User lebouder
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 lebouder
ForwardAgent yes
Host cochon.adm cochon.adm.crans.org
HostName cochon.adm.crans.org
User lebouder
ForwardAgent yes
Host cups.adm cups.adm.crans.org
HostName cups.adm.crans.org
User lebouder
ForwardAgent yes
Host dhcp dhcp.crans.org
HostName dhcp.crans.org
User lebouder
ForwardAgent yes
Host dhcp-21 dhcp-21.crans.org
HostName dhcp-21.crans.org
User lebouder
ForwardAgent yes
Host dhcp.adm dhcp.adm.crans.org
HostName dhcp.adm.crans.org
User lebouder
......@@ -173,6 +153,16 @@ Host fz.adm fz.adm.crans.org
User lebouder
ForwardAgent yes
Host gulp gulp.crans.org
HostName gulp.crans.org
User lebouder
ForwardAgent yes
Host gulp.adm gulp.adm.crans.org
HostName gulp.adm.crans.org
User lebouder
ForwardAgent yes
Host jitsi jitsi.crans.org
HostName jitsi.crans.org
User lebouder
......@@ -183,16 +173,26 @@ Host jitsi.adm jitsi.adm.crans.org
User lebouder
ForwardAgent yes
Host geet git gitlab geet.crans.org git.crans.org gitlab.crans.org
Host geet geet.crans.org
HostName geet.crans.org
User lebouder
ForwardAgent yes
Host geet.adm git.adm gitlab.adm geet.adm.crans.org git.adm.crans.org gitlab.adm.crans.org
Host geet.adm geet.adm.crans.org
HostName geet.adm.crans.org
User lebouder
ForwardAgent yes
Host gitzly git gitlab gitzly.crans.org git.crans.org gitlab.crans.org
HostName gitzly.crans.org
User lebouder
ForwardAgent yes
Host gitzly.adm git.adm gitlab.adm gitzly.adm.crans.org git.adm.crans.org gitlab.adm.crans.org
HostName gitzly.adm.crans.org
User lebouder
ForwardAgent yes
Host ipv6 ipv6-zayo ipv6.crans.org ipv6-zayo.crans.org
HostName ipv6-zayo.crans.org
User lebouder
......@@ -263,7 +263,7 @@ Host news.adm web-news.adm webnews.adm news.adm.crans.org webnews.adm.crans.org
User lebouder
ForwardAgent yes
Host niomniom 15ans autoconfig autostatus crans.ens-cachan.fr crans.org doc i-p install-party wifi www www.15ans niomniom.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 15ans.crans.org www.15ans.crans.org autoconfig.crans.org
Host niomniom autoconfig autostatus doc niomniom.crans.org autostatus.crans.org doc.crans.org autoconfig.crans.org
HostName niomniom.crans.org
User lebouder
ForwardAgent yes
......@@ -273,16 +273,6 @@ Host niomniom.adm niomniom.adm.crans.org
User lebouder
ForwardAgent yes
Host o2 intranet2 switchs o2.crans.org switchs.crans.org intranet2.crans.org
HostName o2.crans.org
User lebouder
ForwardAgent yes
Host o2.adm o2.adm.crans.org
HostName o2.adm.crans.org
User lebouder
ForwardAgent yes
Host odlyd odlyd.crans.org
HostName odlyd.crans.org
User lebouder
......@@ -298,16 +288,6 @@ Host odlyd.wifi odlyd.wifi.crans.org
User lebouder
ForwardAgent yes
Host omnomnom omnomnom.crans.org
HostName omnomnom.crans.org
User lebouder
ForwardAgent yes
Host omnomnom.adm omnomnom.adm.crans.org
HostName omnomnom.adm.crans.org
User lebouder
ForwardAgent yes
Host owl imap pop owl.crans.org pop.crans.org imap.crans.org
HostName owl.crans.org
User lebouder
......@@ -328,16 +308,6 @@ Host owncloud.adm owncloud.adm.crans.org
User lebouder
ForwardAgent yes
Host pea pea.crans.org
HostName pea.crans.org
User lebouder
ForwardAgent yes
Host pea.adm pea.adm.crans.org
HostName pea.adm.crans.org
User lebouder
ForwardAgent yes
Host proxy proxy.crans.org
HostName proxy.crans.org
User lebouder
......@@ -353,6 +323,16 @@ Host redisdead.adm list.adm liste.adm listes.adm lists.adm smtp.adm redisdead.ad
User lebouder
ForwardAgent yes
Host roundcube roundcube-srv roundcube.crans.org roundcube-srv.crans.org
HostName roundcube-srv.crans.org
User lebouder
ForwardAgent yes
Host roundcube.adm roundcube.adm.crans.org
HostName roundcube.adm.crans.org
User lebouder
ForwardAgent yes
Host routeur deconnexion routeur.crans.org deconnexion.crans.org
HostName routeur.crans.org
User lebouder
......@@ -363,11 +343,6 @@ Host routeur.adm routeur.adm.crans.org
User lebouder
ForwardAgent yes
Host routeur-21 routeur-21.crans.org
HostName routeur-21.crans.org
User lebouder
ForwardAgent yes
Host silice silice.crans.org
HostName silice.crans.org
User lebouder
......@@ -406,11 +381,6 @@ Host stitch.adm stitch.adm.crans.org
User lebouder
ForwardAgent yes
Host stun-secondary stun-secondary.crans.org
HostName stun-secondary.crans.org
User lebouder
ForwardAgent yes
Host thot logs psuornotpsu thot.crans.org psuornotpsu.crans.org logs.crans.org
HostName thot.crans.org
User lebouder
......@@ -441,21 +411,11 @@ Host unifi.adm unifi.adm.crans.org
User lebouder
ForwardAgent yes
Host phabricator todo tracker.adm tracker.adm.crans.org
HostName tracker.adm.crans.org
User lebouder
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 lebouder
ForwardAgent yes
Host vo-eth0 vo-eth0.crans.org
HostName vo-eth0.crans.org
User lebouder
ForwardAgent yes
Host vo.adm vo.adm.crans.org
HostName vo.adm.crans.org
User lebouder
......@@ -481,16 +441,6 @@ Host xmpp.adm jabber.adm xmpp.adm.crans.org jabber.adm.crans.org
User lebouder
ForwardAgent yes
Host ytrap-llatsni ytrap-llatsni.crans.org
HostName ytrap-llatsni.crans.org
User lebouder
ForwardAgent yes
Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
HostName ytrap-llatsni.adm.crans.org
User lebouder
ForwardAgent yes
Host zamok ajaxterm bda-paris blogs clubs clubs.ens-cachan.fr mysql perso pot-vieux ssh zamok.crans.org ssh.crans.org perso.crans.org clubs.ens-cachan.fr www.clubs.ens-cachan.fr mysql.crans.org blogs.crans.org bda-paris.crans.org ajaxterm.crans.org clubs.crans.org pot-vieux.crans.org
HostName zamok.crans.org
User lebouder
......@@ -508,14 +458,14 @@ Host zamok.adm users.adm zamok.adm.crans.org users.adm.crans.org
# Accessibles aux apprentis, mais ne sont que sur le VLAN adm
# d'où la ProxyJump
Host babar.adm babar babar babar.adm.crans.org
HostName babar.adm.crans.org
Host cochon.adm cochon.adm.crans.org
HostName cochon.adm.crans.org
User lebouder
ForwardAgent yes
ProxyJump stitch.crans.org
Host bcfg2.adm bcfg2 bcfg2 bcfg2.adm.crans.org re2o-bcfg2 re2o-bcfg2.adm re2o-bcfg2.adm.crans.org
HostName re2o-bcfg2.adm.crans.org
Host cups.adm cups.adm.crans.org
HostName cups.adm.crans.org
User lebouder
ForwardAgent yes
ProxyJump stitch.crans.org
......@@ -549,14 +499,32 @@ Host *-ilo
HostKeyAlgorithms ssh-rsa,ssh-dss
ProxyJump stitch.crans.org
Host omnomnom.adm omnomnom.adm.crans.org
HostName omnomnom.adm.crans.org
User lebouder
ForwardAgent yes
ProxyJump stitch.crans.org
Host phabricator todo tracker.adm tracker.adm.crans.org
HostName tracker.adm.crans.org
User lebouder
ForwardAgent yes
ProxyJump stitch.crans.org
Host radius.adm radius radius radius.adm.crans.org
HostName radius.adm.crans.org
User lebouder
ForwardAgent yes
ProxyJump stitch.crans.org
Host roundcube roundcube.adm roundcube.crans.org roundcube.adm.crans.org
HostName roundcube.adm.crans.org
Host re2o re2o.adm re2o.adm.crans.org intranet intranet.adm intranet.adm.crans.org
HostName re2o.adm.crans.org
User lebouder
ForwardAgent yes
ProxyJump stitch.crans.org
Host re2o-bcfg2 re2o-bcfg2.adm re2o-bcfg2.adm.crans.org bcfg2.adm bcfg2 bcfg2 bcfg2.adm.crans.org
HostName re2o-bcfg2.adm.crans.org
User lebouder
ForwardAgent yes
ProxyJump stitch.crans.org
......@@ -573,6 +541,12 @@ Host vert.adm ldap.adm vert zelda.adm vert vert.adm.crans.org ldap.adm.crans.org
ForwardAgent yes
ProxyJump stitch.crans.org
Host ytrap-llatsni.adm ytrap-llatsni.adm.crans.org
HostName ytrap-llatsni.adm.crans.org
User lebouder
ForwardAgent yes
ProxyJump stitch.crans.org
Host zbee-idrac.adm zbee-idrac zbee-idrac zbee-idrac.adm.crans.org
HostName zbee-idrac.adm.crans.org
User lebouder
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment