From: Vincent Le Gallic <legallic@crans.org>
Date: Mon, 9 Dec 2013 17:11:55 +0000 (+0100)
Subject: Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers... 
X-Git-Url: http://gitweb.pimeys.fr/?a=commitdiff_plain;h=cad116e307af0185af66952a3ef539577753811d;hp=bd7ee39d894565efb790b36db991be91a90b8fb8;p=config-20-100.git

Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchperso into perso
---

diff --git a/.bash_aliases b/.bash_aliases
index 51de8c6..8bf7f37 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -117,9 +117,9 @@ alias mtr='mtr -t'
 # Pour que les semaines de cal commencent le Lundi
 alias cal='ncal -bM'
 
-#~# # Pour que les semaines de cal commencent le Lundi
-#~# alias cal='ncal -bM'
-
+# pure-ftpd
+alias statftp="(cat /var/log/pure-ftpd/transfer.log{,.1}; zcat /var/log/pure-ftpd/*.gz) | awk '{print \$1}' | sort | uniq -c | sort -nr | less"
+alias tailftp='tail -n 100 -f /var/log/pure-ftpd/transfer.log | /home/vincent/scripts/ftp/percent_decode.py --color'
 
 
 # +--------+
diff --git a/.ssh/config b/.ssh/config
index 6d8d45b..a6ad6ad 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -117,6 +117,13 @@ Host pimeys pimeys.fr
     User vincent
     ForwardAgent yes
 
+# Nouveau dédié
+# becue.eu = 62.210.178.115
+Host becue becue.eu
+    HostName becue.eu
+    User vincent
+    ForwardAgent yes
+
 
 # +-----------------+
 # | Machines du BDE |