Merge branch 'perso' of ssh://cerebro.crans.org/git/fichiers_configuration_branchpers...

diff --git a/.bash_aliases b/.bash_aliases
index 51de8c68ad8ef4a9c497751d7e1cab5c28f69d1b..8bf7f3799e12215c50e372124de9d28a6b5828ba 100644 (file)
--- 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 6d8d45b6e63e2b48b94553b45b35be17f16d4ff3..a6ad6ad7e7f4e3fae0a8e36f59ef7868d4e2eb62 100644 (file)
--- 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 |