diff --git a/A_boostrap_nodes.txt b/A_boostrap_nodes.txt index cdc2d32c7..d74b031a3 100644 --- a/A_boostrap_nodes.txt +++ b/A_boostrap_nodes.txt @@ -1,2 +1,3 @@ 2jQUH4HfHxdTesjCjvMCx1VJgA5AnpuvrWRq1swfRdsS +#csmld diff --git a/ISOconfig.sh b/ISOconfig.sh index b9e4291c8..80df33ffa 100755 --- a/ISOconfig.sh +++ b/ISOconfig.sh @@ -123,9 +123,8 @@ echo "$XZUID" > ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ######################################################################## echo "CREATE + profile" ######################################################################## -cd ~/.zen/astrXbian/zen/jaklis -./jaklis.py -n "https://g1.data.e-is.pro" set --name "$XZUID" --avatar "/home/xbian/.zen/astrXbian/logo.png" #CESIUM+ -./jaklis.py -n "https://data.gchange.fr" set --name "$XZUID" --avatar "/home/xbian/.zen/astrXbian/logo.png" #GCHANGE+ +~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.e-is.pro" set --name "$XZUID" --avatar "/home/xbian/.zen/astrXbian/logo.png" #CESIUM+ +~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://data.gchange.fr" set --name "$XZUID" --avatar "/home/xbian/.zen/astrXbian/logo.png" #GCHANGE+ ### REVERT # ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.e-is.pro" erase # ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://data.gchange.fr" erase @@ -134,8 +133,14 @@ cd ~/.zen/astrXbian/zen/jaklis ######################################################################## echo "BECOME FRIEND with oasis (1st bootstrap)" ######################################################################## -./jaklis.py -n "https://g1.data.e-is.pro" like -p 2jQUH4HfHxdTesjCjvMCx1VJgA5AnpuvrWRq1swfRdsS -s 5 -./jaklis.py -n "https://data.gchange.fr" like -p 2jQUH4HfHxdTesjCjvMCx1VJgA5AnpuvrWRq1swfRdsS -s 5 +for g1node in $(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#") # remove comments +do +if [[ $g1node != "" ]]; then + echo "LIKING my BOOTSTRAP node : $g1node" + ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.e-is.pro" like -p $g1node -s 5 + ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://data.gchange.fr" like -p $g1node -s 5 +fi +done ### REVERT # ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.e-is.pro" unlike -p 2jQUH4HfHxdTesjCjvMCx1VJgA5AnpuvrWRq1swfRdsS # ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://data.gchange.fr" unlike -p 2jQUH4HfHxdTesjCjvMCx1VJgA5AnpuvrWRq1swfRdsS @@ -179,9 +184,15 @@ do [[ ! $isLAN && $tryme != "" ]] && echo "$tryme" >> ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr && echo "$tryme" done -echo 'SEND ipfstryme to oasis' # Add your bootstrap Pub here -./jaklis.py -n "https://g1.data.le-sou.org" send -d 2jQUH4HfHxdTesjCjvMCx1VJgA5AnpuvrWRq1swfRdsS -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr -./jaklis.py -n "https://data.gchange.fr" send -d 2jQUH4HfHxdTesjCjvMCx1VJgA5AnpuvrWRq1swfRdsS -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr +echo 'SEND ipfstryme to A_boostrap_nodes.txt listed PUBs' # Add your bootstrap Pub here +for g1node in $(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#") # remove comments +do +if [[ $g1node != "" ]]; then + echo "LIKING my BOOTSTRAP node : $g1node" +# ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.le-sou.org" send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr + ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr +fi +done ######################################################################## echo 'INSTALL Astroport cron_MINUTE' diff --git a/zen/ipfs_BOOTSTRAP_me.sh b/zen/ipfs_BOOTSTRAP_me.sh index bd4ddffa5..e086bcc58 100644 --- a/zen/ipfs_BOOTSTRAP_me.sh +++ b/zen/ipfs_BOOTSTRAP_me.sh @@ -8,10 +8,22 @@ # AstrXbian NODE running it starts acting like a "SSB" PUB # Best using 24/24 public IP node + 1 TB +# GET XZUID +[[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && echo "ERROR no _xbian.zuid" && exit 1 +XZUID=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid) # Should be hostname... but like that can be changed... + +isG1PUBoot=$(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep "$G1PUB") # search my G1PUB ? + +if [[ $isG1PUBoot == "$G1PUB" ]]; then + for liking_me in $(/home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py like | jq -r '.likes[].issuer') + do + echo "SENDING 3 STARS to $liking_me" + /home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py like -p $liking_me -s 3 + echo "Our SWARM will join during ipfs_SWARM_refresh.sh RUN" + + echo "Share collected indexes as mine" + cp /var/www/astrxbian/FASTRXBIAN ~/.zen/ipfs/xbian/F${XZUID} + + done +fi -for liking_me in $(/home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py like | jq -r '.likes[].issuer') -do - echo "SENDING 3 STARS to $liking_me" - /home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py like -p $liking_me -s 3 - echo "Our SWARM will join during ipfs_SWARM_refresh.sh RUN" -done