diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh index 5e3361d..eb805b9 100755 --- a/.install/scuttlebutt.sh +++ b/.install/scuttlebutt.sh @@ -75,7 +75,13 @@ scuttlebutt() { "incoming": { "net": [ { "scope": "public", "host": "0.0.0.0", "external": ["$nodename"], "transform": "shs", "port": 8008 } - ] + ], + "ws": [{ + "scope": ["public", "local", "device"], + "port": 8989, + "transform": "shs", + "http": true + }] }, "outgoing": { "net": [{ "transform": "shs" }] @@ -111,7 +117,13 @@ ssb-server start & "scope": "public", "external": ["$nodename"], "transform": "shs", "port": 8008 }, { "scope": "private", "host": "127.0.0.1", "transform": "shs", "port": 8008 } - ] + ], + "ws": [{ + "scope": ["public", "local", "device"], + "port": 8989, + "transform": "shs", + "http": true + }] }, "outgoing": { "net": [ diff --git a/README.md b/README.md index 16cd4e7..e6f9ad2 100644 --- a/README.md +++ b/README.md @@ -36,3 +36,17 @@ curl -s https://git.p2p.legal/axiom-team/astroport/raw/master/git-install.sh | b ``` **WARNING: This is an early stage develepment, use it with great care!** + +MAIN ENTRANCE BUILD UP +[![](https://pad.p2p.legal/uploads/upload_ac0f943cd66fe8a20925151063a7e78a.jpg)](https://astroport.frama.site/) + + +![](https://pad.p2p.legal/uploads/upload_bfcde4526535bce2cfb12c2e0497587d.png) + +[QWANTIC](https://qwantic.com) +``` + _ ______ _ +/ \\ //\ |\ || | / +\_X \/\//--\| \|| _|_\_ #Web4D + +``` diff --git a/doc/images/astroport_main_entrance.jpg b/doc/images/astroport_main_entrance.jpg new file mode 100644 index 0000000..302a960 Binary files /dev/null and b/doc/images/astroport_main_entrance.jpg differ diff --git a/iptubes b/iptubes index 9bb0292..2484707 160000 --- a/iptubes +++ b/iptubes @@ -1 +1 @@ -Subproject commit 9bb02920fda14aa064f49a243369cd7a4acb61f4 +Subproject commit 24847070307a3342d5d3237aedfe118fc3bc2284 diff --git a/zen/ssb_SURVEY_swarmkey.sh b/zen/ssb_SURVEY_swarmkey.sh index 44897b5..d9ab4cd 100755 --- a/zen/ssb_SURVEY_swarmkey.sh +++ b/zen/ssb_SURVEY_swarmkey.sh @@ -16,10 +16,11 @@ echo ' # ex: ./'$ME' # SURVEY received #astroport-swarmkey ipfs_swarm.key.crypt for IPFS ######################################################################## _ _ _ _ _ -___ _ _ __ - | |_)|_(_ _ _.._._ _ | _ -_|_| | __) _>\/\/(_|| | | ||<(/_\/ - / + __ __ _ _ +(_ (_ |_) _ ._ _ _|_o| _ _ +__)__)|_) _>|_||\/(/_\/ | ||(/__> + / + USED ONLY ONCE... Next swarm.key change will accurs in ~/.zen/ipfs-swarm { @@ -46,16 +47,14 @@ USED ONLY ONCE... Next swarm.key change will accurs in ~/.zen/ipfs-swarm }, "timestamp": 1585194822367 } - - ' - +[[ -f ~/.ipfs/ipfs_swarm.key ]] && echo "SWARM KEY ~/.ipfs/ipfs_swarm.key OK !!!" && exit 0 self=$(sbotc whoami | jq -r .id) || exit 1 g1self=$(echo $self | cut -d '@' -f 2 | cut -d '.' -f 1 | base64 -d | base58) self_name=$(sbotc query.read '{"query":[{"$filter":{"value":{"author": "'"$self"'", "content":{"type":"about", "about": "'"$self"'"}}}}]}' | jq -r .value?.content?.name | grep -v null | tail -n 1) ipfsnodeid=$(ipfs id -f='\n') -[[ -f ~/.ipfs/ipfs_swarm.key ]] && echo "SWARM KEY OK" && exit 1 + # SEARCH "#astroport-swarmkey" CMD in message text # Not working without patchwork (TODO: find bug. installation ok!? activate? ssb-server ssb-backlinks node_modules. HELP !! ) @@ -79,8 +78,9 @@ messages=$(sbotc messagesByType '{"type":"post"}') while read -r msg do - attached_file=$(printf %s "$msg" | jq -r .value.content.mentions.link 2>/dev/null) - + author=$(printf %s "$msg" | jq -r .value.author) + attached_file=$(printf %s "$msg" | jq -r .value.content.mentions[].name 2>/dev/null) + if [[ $attached_file == "ipfs_swarm.key.crypt" ]]; then echo ' @@ -90,11 +90,12 @@ __)\/\//--\| \| | |\|_ | de(_|\/|_)|_ / | to ~/.ipfs/ipfs_swarm.key ' - mytmp=$(mktemp -d "${TMPDIR:-/tmp}/ssb-npm.XXXXXXXXX") - curl -s "http://localhost:8989/blobs/get/$attached_file" > $mytmp/ipfs_swarm.key.crypt - $MY_PATH/tools/natools.py decrypt -k ~/.ssb/secret.dunikey -i $mytmp/ipfs_swarm.key.crypt -o ~/.ipfs/ipfs_swarm.key - - + mylink=$(printf %s "$msg" | jq -r .value.content.mentions[].link) + mytmp=$(mktemp -d "${TMPDIR:-/tmp}/astroport.swarmkey.XXXXXXXXX") + curl -s "http://localhost:8989/blobs/get/$mylink" > $mytmp/ipfs_swarm.key.crypt + $MY_PATH/tools/natools.py decrypt --pubsec -k ~/.ssb/secret.dunikey -i $mytmp/ipfs_swarm.key.crypt -o ~/.ipfs/ipfs_swarm.key && \ + echo "IPFS SWARM KEY ~/.ipfs/ipfs_swarm.key received from SSB $author ... OK !" + echo ' ___ _ _ __ | |_)|_(_ _| _. _ ._ _ _ ._