diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh index a490245..5df4ad4 100755 --- a/.install/scuttlebutt.sh +++ b/.install/scuttlebutt.sh @@ -2,6 +2,7 @@ scuttlebutt() { echo -e "${c_yellow}Onboarding SCUTTLEBUTT...$c_" where_is_ssb_installed=$(which ssb-server) + where_is_oasis_installed=$(which oasis) mkdir -p ~/.zen BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" @@ -24,7 +25,7 @@ scuttlebutt() { ### Install module npm install sodium-native ssb-backlinks ssb-ws ssb-links ssb-query ssb-secret-blob ssb-private npm install -g ssb-server - + # TODO plugin activation !?? # sbot plugins.enable @@ -58,20 +59,22 @@ scuttlebutt() { # Symlink ~/.ssb -> ~/.ssb_astroport [[ -L ~/.ssb ]] && rm ~/.ssb [[ -d ~/.ssb_astroport ]] && ln -s ~/.ssb_astroport ~/.ssb - printf '{"manifest":"sync"}' > ~/.ssb/manifest.json + ## #TODO get ~/.ssb/manifest.json from template + cp ./templates/ssb/manifest.json ~/.ssb/manifest.json # Create config (TODO: adapt if public Pub or Local Node) # TODO: Create unique hostname in swarm !! uidna nodename=$(cat /etc/hostname) extension=$(echo $nodename | cut -d '.' -f 2) - if [[ $extension == $nodename ]]; then - - - nodename=$nodename.local - # LOCAL - cat > ~/.ssb/config < ~/.ssb/config < ~/.zen/run-ssb_server.sh < ~/.zen/launch-oasis.sh < ~/.zen/ssb.pid.bash -while true; do - ssb-server start - # IF ANY PROBLEM CHANGE TO - # ssb-daemon - # MANAGE WITH OASIS http://$nodename:3000 - # oasis --allow-host $nodename --host $nodename - echo _! > ~/.zen/ssb.pid -done +oasis --allow-host $nodename --host $nodename EOF -# REPLACE _ with $ -sed -i s/_/\$/g ~/.zen/run-ssb_server.sh -chmod 755 ~/.zen/run-ssb_server.sh -ssb-server start & - - - else - - - # PUB - cat > ~/.ssb/config < ~/.zen/run-ssb_server.sh < ~/.zen/ssb.pid.bash -while true; do - ssb-server start --host $nodename - - # IF ANY PROBLEM CHANGE TO - # ssb-daemon - # MANAGE WITH OASIS http://$nodename:3000 - # oasis --allow-host $nodename --host $nodename - - echo _! > ~/.zen/ssb.pid -done -EOF - # REPLACE _ with $ - sed -i s/_/\$/g ~/.zen/run-ssb_server.sh - chmod 755 ~/.zen/run-ssb_server.sh - ssb-server start & - - fi echo " _ __ __ _ @@ -169,20 +111,18 @@ $nodename __)|_| \ \/ |_| \ || || |_ ... SCUTTLEBUTT ... OK? ' - echo "DOES ssb-server IS RUNNING FINE?" - echo "YOU CAN CHOOSE ssb-daemon INSTEAD..." - - echo "ADD TO YOUR '/etc/rc.local' !!! " + echo "Launching oasis" + oasis --allow-host $nodename --host $nodename & + echo " http://$nodename:3000 " + echo + echo "ADD ~/.zen/launch-oasis.sh TO YOUR '/etc/rc.local' !!! Or use patchwork. " sleep $((1 + RANDOM % 5)) echo "LAUNCHING OASIS NODE MANAGER http://$nodename:3000" - sbotc -t async manifest > ~/.ssb/manifest.json - oasis --allow-host $nodename --host $nodename & - echo "TODO: Protect behind nginx redirect !!!" + echo "IF YOU ARE A PUB consider protect it behind password nginx redirect !!!" - echo "WAIT 10 seconds then ssb_INIT.sh" - - sleep 10 + echo "3 seconds before ssb_INIT.sh..." + sleep 3 $MY_PATH/zen/ssb_INIT.sh } diff --git a/.install/templates/ssb/manifest.json b/.install/templates/ssb/manifest.json new file mode 100644 index 0000000..8ed9b88 --- /dev/null +++ b/.install/templates/ssb/manifest.json @@ -0,0 +1,118 @@ +{ + "auth": "async", + "address": "sync", + "manifest": "sync", + "multiserver": { + "parse": "sync", + "address": "sync" + }, + "multiserverNet": {}, + "get": "async", + "createFeedStream": "source", + "createLogStream": "source", + "messagesByType": "source", + "createHistoryStream": "source", + "createUserStream": "source", + "createWriteStream": "sink", + "links": "source", + "add": "async", + "publish": "async", + "getAddress": "sync", + "getLatest": "async", + "latest": "source", + "latestSequence": "async", + "whoami": "sync", + "progress": "sync", + "status": "sync", + "getVectorClock": "async", + "version": "sync", + "help": "sync", + "seq": "async", + "usage": "sync", + "clock": "async", + "plugins": { + "install": "source", + "uninstall": "source", + "enable": "async", + "disable": "async", + "help": "sync" + }, + "gossip": { + "add": "sync", + "remove": "sync", + "connect": "async", + "disconnect": "async", + "changes": "source", + "reconnect": "sync", + "disable": "sync", + "enable": "sync", + "ping": "duplex", + "get": "sync", + "peers": "sync", + "help": "sync" + }, + "replicate": { + "changes": "source", + "upto": "source", + "request": "sync", + "block": "sync" + }, + "friends": { + "hopStream": "source", + "onEdge": "sync", + "isFollowing": "async", + "isBlocking": "async", + "hops": "async", + "help": "sync", + "get": "async", + "createFriendStream": "source", + "stream": "source" + }, + "blobs": { + "get": "source", + "getSlice": "source", + "add": "sink", + "rm": "async", + "ls": "source", + "has": "async", + "size": "async", + "meta": "async", + "want": "async", + "push": "async", + "changes": "source", + "createWants": "source", + "help": "sync" + }, + "backlinks": { + "read": "source" + }, + "invite": { + "create": "async", + "use": "async", + "accept": "async" + }, + "query": { + "read": "source", + "explain": "sync", + "help": "sync" + }, + "search": { + "query": "source", + "help": "sync" + }, + "links2": { + "read": "source" + }, + "ws": {}, + "ebt": { + "replicate": "duplex", + "request": "sync", + "block": "sync", + "peerStatus": "sync" + }, + "ooo": { + "stream": "duplex", + "get": "async", + "help": "sync" + } +} diff --git a/doc/FeuilletonML.pdf b/doc/FeuilletonML.pdf new file mode 100644 index 0000000..1ffb446 Binary files /dev/null and b/doc/FeuilletonML.pdf differ diff --git a/g1sms/sms_received.sh b/g1sms/sms_received.sh old mode 100644 new mode 100755 diff --git a/g1sms/tag_READ_XY.sh b/g1sms/tag_READ_XY.sh old mode 100644 new mode 100755 diff --git a/www/LOVEBank/index.html b/www/LOVEBank/index.html index 0566d66..e868228 100644 --- a/www/LOVEBank/index.html +++ b/www/LOVEBank/index.html @@ -8,7 +8,7 @@ - Ouvrir un compte! Banque en ligne sans revenu & Crypto-monnaie prometteuse 2018 [ Made In Zion / Banque Libre Ḡ1 ] + Astroport embarquement en cours... décollage imminent @@ -40,11 +40,11 @@
-

Astroport embarquement...

+

Astroport

-

Décollage imminent

+

compte à rebour enclenché

@@ -58,7 +58,7 @@
-

Prenez place



+

Activer une nouvelle Station



@@ -77,7 +77,7 @@
-

Soyez vous-même...
Soyons Libres!

+

Recevez votre Clef
Libérez-vous... Soyez vous même

diff --git a/zen/ssb_INIT.sh b/zen/ssb_INIT.sh index 2628c4a..e6c4b37 100755 --- a/zen/ssb_INIT.sh +++ b/zen/ssb_INIT.sh @@ -45,6 +45,9 @@ g1pub=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) [[ $g1pub == "" ]] && echo "ERROR g1pub empty !! Please check it..." && exit 1 ######################################################################## +# GET NODE disk performance. TODO, publish and use as IPFS repartition +diskperf=$(dd if=/dev/zero of=~/test.disk bs=10M count=1 oflag=dsync 2>&1 | tail -n 1) + # IPFS LOCAL REPOSITORY for Node Identity G1 + SSB mkdir -p ~/.zen/ipfs/.$ipfsnodeid/G1SSB @@ -94,7 +97,7 @@ $ssbpub -- sbot publish -- " -sbot publish --type about --about $ssbpub --description "[Astroport Node](https://astroport.com) [$ipfsnodeid](http://localhost:8080/ipns/$ipfsnodeid) - Wallet $g1pub - Use your KEY ~/.ssb/secret.dunikey in [Cesium](https://cesium.app)" --name "$title" --image "$id" +sbot publish --type about --about $ssbpub --description "[Astroport Node](https://astroport.com) [$ipfsnodeid](http://localhost:8080/ipns/$ipfsnodeid) - Wallet $g1pub - $diskperf" --name "$title" --image "$id" # REQUEST DUNITER G1 Wallet balance DUNITERNODE=$($MY_PATH/tools/duniter_getnode.sh) diff --git a/zen/tools/make_G1SSB_secret.sh b/zen/tools/make_G1SSB_secret.sh index c846412..eac1c90 100755 --- a/zen/tools/make_G1SSB_secret.sh +++ b/zen/tools/make_G1SSB_secret.sh @@ -176,7 +176,7 @@ echo '>>>>>>> METAVERSE KEY CREATION <<<<<<<< KEY -CHOOSE YOU LOGIN (best more than 6 words)... +CHOOSE YOU LOGIN (min 8 car. best is more than 6 words!!)... or LEAVE BLANK and HIT ENTER FOR diceware AUTO GENERATION ' read salt