diff --git a/zen/ssh_forward2onelove.sh b/zen/ssh_forward2onelove.sh index 85b6765..40d5b4d 100755 --- a/zen/ssh_forward2onelove.sh +++ b/zen/ssh_forward2onelove.sh @@ -15,7 +15,6 @@ G1PUB=$(cat ~/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) || er+=" G1PU ######################################################################## ## ACTIVATE / DESACTIVATE SSH FORWARD to fred@ONELOVE ######################################################################## -ARG=$(echo "$1" | awk '{ print tolower($0) }') if [[ ! $(cat ~/.ssh/authorized_keys | grep "fred@ONELOVE") ]] then @@ -25,23 +24,22 @@ else echo "fred@ONELOVE already in ~/.ssh/authorized_keys" fi -## CREATE RANDOM PORT -PORT="109${RANDOM:0:2}" if [[ "$G1PUB" != "Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS" ]] then - if [[ "$ARG" == "stop" ]] + if [[ $(ipfs p2p ls | grep $G1PUB-ssh) ]] then ipfs p2p close -p /x/$G1PUB-ssh echo "ipfs p2p close -p /x/$G1PUB-ssh" > /tmp/ssh.forward ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS -t "SSH-STOP" -f /tmp/ssh.forward - echo "Arrêt dépannage fred@ONELOVE" + echo "STOP" else ipfs p2p listen /x/$G1PUB-ssh /ip4/127.0.0.1/tcp/22 ## SEND jaklis message to onelove for remote access + PORT="109${RANDOM:0:2}" # RANDOM PORT echo "ipfs p2p forward /x/$G1PUB-ssh /ip4/127.0.0.1/tcp/$PORT /p2p/$IPFSNODEID ssh $USER@localhost -p $PORT" > /tmp/ssh.forward ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS -t "SSH-OPEN" -f /tmp/ssh.forward - echo "Demande de dépannage envoyée à fred@ONELOVE" + echo "Demande de dépannage envoyé à fred@ONELOVE (Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS)" fi fi