diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index a9411fbc..e10d50e8 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -178,9 +178,12 @@ for PLAYER in ${PLAYERONE[@]}; do echo "LAT=${LAT}; LON=${LON}; UMAPNS=${UMAPNS}" - ## TODATENS ################## UPDATE GPS Tiddler ############# + ## TODATENS ################ TODATENS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}") - echo "TODAY UMAPNS : ${myIPFS}/ipns/${TODATENS}" + echo "GPS UMAP LINK UPDATE + ${YESTERDATE} : ${myIPFS}/ipns/${UMAPNS} + ${TODATE} : ${myIPFS}/ipns/${TODATENS}" + ## UPDATE TW GPS Tiddler ############# sed -i "s~${UMAPNS}~${TODATENS}~g" ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html ## STORE IN PLAYER CACHE diff --git a/tools/ipfs_P2P_forward.sh b/tools/ipfs_P2P_forward.sh index d335bd69..8653a51a 100755 --- a/tools/ipfs_P2P_forward.sh +++ b/tools/ipfs_P2P_forward.sh @@ -10,44 +10,44 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized . "$MY_PATH/my.sh" ######################################################################## YOU=$(myIpfsApi) || er+=" ipfs daemon not running" -[[ $IPFSNODEID == "" ]] && IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID) || er+=" ipfs id problem" [[ "$YOU" == "" || "$IPFSNODEID" == "" ]] && echo "ERROR : $er " && exit 1 ######################################################################## +PARAM="$1" ## can STOP or OFF +if [[ "${PARAM,,}" == "off" || "${PARAM,,}" == "stop" ]]; then + ipfs p2p close --all + rm ~/.zen/tmp/$IPFSNODEID/x_ssh.sh 2>/dev/null + echo "STOP" && exit 0 +fi # Make Station publish SSH port on "/x/ssh-$(IPFSNODEID)" -zuid="$(hostname -f)" zuid=${IPFSNODEID} -if [[ $zuid ]] +if [[ ! $(cat ~/.ssh/authorized_keys | grep "fred@ONELOVE") ]] then - if [[ ! $(cat ~/.ssh/authorized_keys | grep "fred@ONELOVE") ]] - then - echo "# ADD fred@ONELOVE to ~/.ssh/authorized_keys" && mkdir -p ~/.ssh - echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFLHW8P88C/B7622yXzdAn1ZcTBfE1A4wMqajBwAoHwUVTOUaYfvkiSxbzb5H9dPTAXhQU6ZfuLa70kTo1m2b9TKH0tD6hR3RiKJ0NIjCHYEypcPGpLmHaZWnBKPq3IUU24qFVdUJxnTkDdFUszYMNoV4nqlXY/ZYdNpic8L1jPPyfOLLfPFkuSxagyQj4FGJq77UQE5j+skMJS3ISkazNTLqOCGLFJ5qtBC11BvQaCJ4cQ2Ss7ejPYhpx16NLJfg9VtG4dv9ZebEIl2pf7niiQGSPrDMFWHuQcGAuHt/patr0BcvfvD3Gv+qNsVfAJCNZ2U5NHEMKIhgj1ilNPEw7 fred@ONELOVE" >> ~/.ssh/authorized_keys - fi - - echo "Lanching /x/ssh-$zuid" - [[ ! $(ipfs p2p ls | grep "/x/ssh-$zuid") ]] && ipfs p2p listen /x/ssh-$zuid /ip4/127.0.0.1/tcp/22 - # echo "echo \"ssh-$zuid local port please?\"; read lport; ipfs p2p forward /x/ssh-$zuid /ip4/127.0.0.1/tcp/$lport /p2p/$IPFSNODEID" >> ~/.zen/tmp/$IPFSNODEID/astroport/port + echo "# ADD fred@ONELOVE to ~/.ssh/authorized_keys" && mkdir -p ~/.ssh + echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFLHW8P88C/B7622yXzdAn1ZcTBfE1A4wMqajBwAoHwUVTOUaYfvkiSxbzb5H9dPTAXhQU6ZfuLa70kTo1m2b9TKH0tD6hR3RiKJ0NIjCHYEypcPGpLmHaZWnBKPq3IUU24qFVdUJxnTkDdFUszYMNoV4nqlXY/ZYdNpic8L1jPPyfOLLfPFkuSxagyQj4FGJq77UQE5j+skMJS3ISkazNTLqOCGLFJ5qtBC11BvQaCJ4cQ2Ss7ejPYhpx16NLJfg9VtG4dv9ZebEIl2pf7niiQGSPrDMFWHuQcGAuHt/patr0BcvfvD3Gv+qNsVfAJCNZ2U5NHEMKIhgj1ilNPEw7 fred@ONELOVE" >> ~/.ssh/authorized_keys fi +echo "Lanching /x/ssh-$zuid" +[[ ! $(ipfs p2p ls | grep "/x/ssh-$zuid") ]] && ipfs p2p listen /x/ssh-$zuid /ip4/127.0.0.1/tcp/22 +# echo "echo \"ssh-$zuid local port please?\"; read lport; ipfs p2p forward /x/ssh-$zuid /ip4/127.0.0.1/tcp/$lport /p2p/$IPFSNODEID" >> ~/.zen/tmp/$IPFSNODEID/astroport/port + ipfs p2p ls -## CONNECT WITH COMMAND +## PREPARE x_ssh.sh ## ipfs cat /ipns/$IPFSNODEID/.$IPFSNODEID/x_ssh.sh | bash -rm ~/.zen/tmp/$IPFSNODEID/x_ssh.sh >/dev/null 2>&1 -if [[ ! -f ~/.zen/tmp/$IPFSNODEID/x_ssh.sh ]]; then - PORT=12345 - [ ${PORT} -eq 12345 ] && PORT=$((PORT+${RANDOM:0:3})) || PORT=$((PORT-${RANDOM:0:3})) - echo "if [[ ! \$(ipfs p2p ls | grep x/ssh-$zuid) ]]; then - ipfs --timeout=5s ping -n 1 /p2p/$IPFSNODEID - ipfs p2p forward /x/ssh-$zuid /ip4/127.0.0.1/tcp/$PORT /p2p/$IPFSNODEID - ssh $USER@127.0.0.1 -p $PORT +PORT=22000 +PORT=$((PORT+${RANDOM:0:3})) + +echo "if [[ ! \$(ipfs p2p ls | grep x/ssh-$zuid) ]]; then +ipfs --timeout=5s ping -n 1 /p2p/$IPFSNODEID +ipfs p2p forward /x/ssh-$zuid /ip4/127.0.0.1/tcp/$PORT /p2p/$IPFSNODEID +ssh $USER@127.0.0.1 -p $PORT fi" > ~/.zen/tmp/$IPFSNODEID/x_ssh.sh -fi cat ~/.zen/tmp/$IPFSNODEID/x_ssh.sh -echo "https://ipfs.copylaradio.com/ipns/$IPFSNODEID/x_ssh.sh" + +echo "$myIPFS/ipns/$IPFSNODEID/x_ssh.sh" ## THIS PORT FORWARDING HUB COULD BE MADE MORE CONTROLABLE USING FRIENDSHIP LEVEL & IPFS BALISES