Merge branch 'master' into perso

[config-20-100.git] / .bash_aliases

diff --git a/.bash_aliases b/.bash_aliases
index 1cd4a7bcece63ea732b3cbb4572f049e9ddb8b3f..9fd1ee3cb68dda0370094c3b823a39e436d880f2 100644 (file)
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -50,6 +50,7 @@ alias sshadd='ssh-add -t 1800'
 # Tunnels (pour les membres actifs)
 alias sshimprimante="echo -e 'Port : 2222\nRappel : http://localhost:2222';ssh -L 2222:imprimante.adm.crans.org:80 vo"
 alias sshbabar="echo -e 'Port : 3333\nRappel : http://localhost:3333/backuppc';ssh -L 3333:babar.adm.crans.org:80 vo"
+alias sshomnomnom="echo -e 'Port : 3333\nRappel : http://localhost:3333/backuppc';ssh -L 3333:omnomnom.adm.crans.org:80 vo"
 
 # Shortcuts
 alias zamok="ssh zamok"
@@ -117,9 +118,6 @@ alias mtr='mtr -t'
 # Pour que les semaines de cal commencent le Lundi
 alias cal='ncal -bM'
 
-# Pour synchro gpg ede cabal à ici
-alias syncgpg='(ssh cabal gpg --export-options export-local-sigs --export-options export-attributes --export | gpg --import); scp cabal:~/.gnupg/trustdb.gpg ~/.gnupg/'
-
 
 # +--------+
 # | Divers |
@@ -174,8 +172,5 @@ alias jabba='jabba 2>&1 | sed "s/introuvable/jabba/"'
 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'
 
-# Pour envoyer les passwords de eva à cabal
-alias syncpass='if [[ "`hostname`" = "eva" ]]; then scp -o PubkeyAuthentication=no .pass/pss.gpg vincent@cabal.crans.org:.pass/pss.gpg; else echo "Do it on eva"; fi'
-
 # backup-manager
 alias uploadbackups='backup-manager --upload'