diff --git a/bash/.bashrc b/bash/.bashrc index 0cf7b3d..63fa63f 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -224,29 +224,31 @@ function man { #{{{ man "$@" } #}}} -alias ssh='my_ssh' -function my_ssh #{{{ -{ - ssh-add -l | grep id_rsa.auth > /dev/null - if [ $? -eq 1 ]; then - echo -e "$RED Please enter ssh passphrase ;) $DFT" - ssh-add ~/.ssh/id_rsa.auth - fi; - /usr/bin/ssh "$@" -} -# }}} +if [[ -z $SSH_CLIENT ]]; then + alias ssh='my_ssh' + function my_ssh #{{{ + { + ssh-add -l | grep id_rsa.auth > /dev/null + if [ $? -eq 1 ]; then + echo -e "$RED Please enter ssh passphrase ;) $DFT" + ssh-add ~/.ssh/id_rsa.auth + fi; + /usr/bin/ssh "$@" + } + # }}} -alias scp='my_scp' -function my_scp #{{{ -{ - ssh-add -l | grep id_rsa.auth > /dev/null - if [ $? -eq 1 ]; then - echo -e "$RED Please enter ssh passphrase ;) $DFT" - ssh-add ~/.ssh/id_rsa.auth - fi; - /usr/bin/scp "$@" -} -# }}} + alias scp='my_scp' + function my_scp #{{{ + { + ssh-add -l | grep id_rsa.auth > /dev/null + if [ $? -eq 1 ]; then + echo -e "$RED Please enter ssh passphrase ;) $DFT" + ssh-add ~/.ssh/id_rsa.auth + fi; + /usr/bin/scp "$@" + } + # }}} +fi function logs #{{{ { @@ -585,6 +587,11 @@ function cttc fi } +function dockat +{ + docker attach -ti $1 bash +} + # }}} SSHAGENT=/usr/bin/ssh-agent diff --git a/ssh/.ssh/authorized_keys b/ssh/.ssh/authorized_keys index bc6be67..f00e15b 100644 --- a/ssh/.ssh/authorized_keys +++ b/ssh/.ssh/authorized_keys @@ -1,2 +1,2 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXvejaLTKO/MuSRi0YBntTaraYasUEpzQG21882dbibxPCjaClP8YKRTHbWQJJewkKMkRyn1oEwkLghuKA2wJ/KjxhU/0SAJO/eOeYp76FR8am2nNsSXJfoEXHaVanG6TeE9Vxi5+2Xq5g9hsZCuYqZtFxRr6IF4N/8qorWGQVAd/Ofz4A5TaeOEvfMFQPn1mGbbRpKweuZYHXKwhtnDBXkAi8JBUdMSoTgvFe54gG47d2hXoypQeROtV43vyKw5kCVDKlY0XubciqJMthMlrkVDfZeVNJ35vjTeXmGwcoaQlXxOKJ/9sutt+SQ5VXm7WQ0WUbBmqDO+ORjbGIQttf root@villaro-dixon -ssh-dss AAAAB3NzaC1kc3MAAACBAPkckl0mPtb7TfqBUEWq33EugLJKNODRMpqGX53U5daV/YB+bO8tIrrpf/yT1JUCYvYp2UZNGs9uTJW16qTigHfi+3uSpX3HCkvO559jpzSi2GebO5uQ1eEcjoURZN9lOnWaCTtbj+9e7PMriz3w+hco/WpNMC9YnYmzGz22SFMJAAAAFQDhh0Xh3IBv+Eb9Q3CCrw+lQ+ZqXwAAAIEAvs8IJs0K40ndhM/LfyVK6nEhSVRAyytY5j+P9mbA4QE5rIIA7tek+NVO5F/O85ZyovahasA2PMCKSSHGAwSi20P/iJa6PW9h7G8VzbTsb8YkYQkJPpgGvQF1HfiCNXxLh02sWelZE3M13Hj3BC9EFlp44a6RuvNizuLKwM0FvEUAAACBAJ8YoGbkMkvgf87jf2opDQdHtX2zXuAXs7MKI0SU0vjKzEKntmuOuWiRwOHjFwOacvSzGoM59JlCqGVO/jaT4wkZz25vfYeidn/4D4zpveQe8J6vWMD/SpT+YUaPY8S5SMRlUQnAiLp8TAsu1W3VpyfyR9zb4miDuPYnYHY9uQGo root@backupbox +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD6mBZ11FjmSAdvnkCRzysyCQUAhofaxP6INI5qZ3NeI9AIj3ryRiUAzsbpI7itXRGwmw/kuvo68GHHPonECgcipP+11D7/B3wE2pC8Vs45VKJzO0ahTgxom6locS5KZ0ayk3259Qu+BB3xGrTN+dzIgWUiUdDD0IG0xjwyEwNCMyqwbxeXwEJfrKzWvJ/gZZW8wOFuxCmxDYcpBq3GM+i9Q0v+aSYVXHWUm+oymr1oGFqRlwLiU9bH8D0EFRNABwKkP3E+XWclpgIPzvjfVjll8F9G2n00zby5zFtU7/ghPIqiTAdfR7S2IRF4fZ4Qm+QzxVl6oMbXhJbccZ2Zbzjz root@backupbox diff --git a/ssh/.ssh/config b/ssh/.ssh/config index 563f517..624d769 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -65,3 +65,6 @@ host erivers port 22123 #2001:620:600:ac00:1a03:73ff:fe23:fc23/ hostname 129.194.173.249 + +host osmutils + ProxyCommand ssh vi-di.fr nc 192.168.42.2 %p diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add index 0f45fdd..8aedad0 100644 --- a/vim/.vim/spell/en.utf-8.add +++ b/vim/.vim/spell/en.utf-8.add @@ -94,3 +94,4 @@ Thinkpad Aurelia Victorinox kevlar +bbox