Envoyez un don. Recevez le lien vers ce film dans votre messagerie Cesium+
- "
+
+
Voir ce Film:
+
Installez Cesium+
+
+
+
+
+
+
+
+
+
+
Flashez, envoyez un don...
+ ce soir, recevez le lien dans votre messagerie.
+
+
+
+
+
+ "
## MAKING TIDDLER
echo "## Creation json tiddler ~/.zen/game/players/${PLAYER}/G1Kodi/${TITLE}.dragdrop.json"
diff --git a/BOOSTRAP/OC_API.md b/BOOKS/OC_API.md
similarity index 100%
rename from BOOSTRAP/OC_API.md
rename to BOOKS/OC_API.md
diff --git a/BOOSTRAP/Readme.md b/BOOKS/Readme.md
similarity index 99%
rename from BOOSTRAP/Readme.md
rename to BOOKS/Readme.md
index ed8f275f..68017209 100644
--- a/BOOSTRAP/Readme.md
+++ b/BOOKS/Readme.md
@@ -123,7 +123,7 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtg3SlRxtzsQnsBSeU83W0tvUyBTUvOU5lhjlbZVPCZ
* “keygen” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/tools/keygen
* “natools” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/tools/natools.py
* “jaklis” https://git.p2p.legal/axiom-team/jaklis
-* “ipfs” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/kubo_v0.20.0_linux.install.sh
+* “ipfs” https://git.p2p.legal/STI/Astroport.ONE/src/branch/master/install.kubo_v0.20.0_linux.sh
## ASTROPORT CREW GILET https://astroport.myspreadshop.fr/create?product=a68ad31e-d554-4c75-821d-97b00d6ad13f&view=2
diff --git a/BOOKS/TheNetworkState.pdf b/BOOKS/TheNetworkState.pdf
new file mode 100644
index 00000000..2dbda2a8
Binary files /dev/null and b/BOOKS/TheNetworkState.pdf differ
diff --git a/docker-compose.duniter.yml b/DOCKER/docker-compose.duniter.yml
similarity index 100%
rename from docker-compose.duniter.yml
rename to DOCKER/docker-compose.duniter.yml
diff --git a/docker-compose.duniter1.8.7.yml b/DOCKER/docker-compose.duniter1.8.7.yml
similarity index 100%
rename from docker-compose.duniter1.8.7.yml
rename to DOCKER/docker-compose.duniter1.8.7.yml
diff --git a/docker-compose.minetest.yml b/DOCKER/docker-compose.minetest.yml
similarity index 100%
rename from docker-compose.minetest.yml
rename to DOCKER/docker-compose.minetest.yml
diff --git a/docker-compose.nextcloud.yml b/DOCKER/docker-compose.nextcloud.yml
similarity index 100%
rename from docker-compose.nextcloud.yml
rename to DOCKER/docker-compose.nextcloud.yml
diff --git a/docker-compose.nginx-proxy-manager.yml b/DOCKER/docker-compose.nginx-proxy-manager.yml
similarity index 100%
rename from docker-compose.nginx-proxy-manager.yml
rename to DOCKER/docker-compose.nginx-proxy-manager.yml
diff --git a/README.md b/README.md
index 57f1977d..92cc9f0b 100644
--- a/README.md
+++ b/README.md
@@ -331,7 +331,9 @@ GET /?player=${PLAYER}&moa=json&tag=G1CopierYoutube
> CAN BE EXTENDED
## ➤ AMZQR : Create a QRCode with "amzqr"
-### ```/?amzqr=${URLENCODEDSTRING}&logo=${IMAGE}```
+```http
+GET /?amzqr=${URLENCODEDSTRING}&logo=${IMAGE}
+```
| Parameter | Type | Description |
| :-------- | :------- | :-------------------------------- |
@@ -341,7 +343,9 @@ GET /?player=${PLAYER}&moa=json&tag=G1CopierYoutube
check available "logo.png" in [./images](./images)
## ➤ UPLANET : Create Umap, AstroID & ZenCard for PLAYER (email)
-### ```/?uplanet=${PLAYER}&zlat=${LAT}&zlon=${LON}&g1pub=${PASS}```
+```http
+GET /?uplanet=${PLAYER}&zlat=${LAT}&zlon=${LON}&g1pub=${PASS}
+```
| Parameter | Type | Description |
| :-------- | :------- | :-------------------------------- |
@@ -473,12 +477,13 @@ http://localhost:12345 renvoi un json
| created | date de creation du document |
| hostname | nom de la station |
| myIP | adresse IP de la station |
-| ipfsnodeid | date de creation du document |
+| ipfsnodeid | Clef publique, balise de la station |
| astroport | Lien vers l'API de la station |
| g1station | Lien vers la carte PLAYER de la Station |
| g1swarm | Lien vers la carte des cartes des Stations de l'essaim |
-Afin de propager la carte chaque Stations lors de son raffraichissement de cache demande aux Boostrap de la récupérer
+Afin de propager la carte chaque station lors de son raffraichissement de cache
+ envoi aux Boostrap une requête pour upload (```/ipns/${IPFSNODEID}```)
```
STATION MAP UPSYNC : http://$nodeip:12345/?${GNODEID}=${IPFSNODEID}
```
diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh
index a49cc648..cb4f322c 100755
--- a/RUNTIME/PLAYER.refresh.sh
+++ b/RUNTIME/PLAYER.refresh.sh
@@ -176,8 +176,12 @@ for PLAYER in ${PLAYERONE[@]}; do
echo "LAT=${LAT}; LON=${LON}; UMAPNS=${UMAPNS}"
- ## TODATENS ################
- TODATENS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}")
+ ## UMAP TODATENS ################
+ ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/todate.ipfskey "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}"
+ ipfs key rm "_todate" 2>/dev/null
+ TODATENS=$(ipfs key import "_todate" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/todate.ipfskey)
+ ipfs key rm "_todate" 2>/dev/null
+
echo "GPS UMAP LINK UPDATE
${YESTERDATE} : ${myIPFS}${UMAPNS}
${TODATE} : ${myIPFS}/ipns/${TODATENS}"
diff --git a/RUNTIME/PLAYER.unplug.sh b/RUNTIME/PLAYER.unplug.sh
index c7c5da3e..d75fe782 100755
--- a/RUNTIME/PLAYER.unplug.sh
+++ b/RUNTIME/PLAYER.unplug.sh
@@ -6,7 +6,7 @@
################################################################################
MY_PATH="`dirname \"$0\"`" # relative
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
-. "$MY_PATH/my.sh"
+. "$MY_PATH/../tools/my.sh"
################################################################################
## UNPLUG A PLAYER FROM ASTROPORT STATION
############################################
@@ -61,7 +61,7 @@ mkdir -p ~/.zen/tmp/${MOATS}
[[ ! -z ${SECTORG1PUB} ]] \
&& echo "> PAY4SURE ZEN:${ALL} WALLET MOVE" \
- && ${MY_PATH}/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${ALL}" "${SECTORG1PUB}" "UNPLUG:${ALL}"
+ && ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${ALL}" "${SECTORG1PUB}" "UNPLUG:${ALL}"
## REMOVING PLAYER from ASTROPORT
ipfs key rm ${PLAYER}; ipfs key rm ${PLAYER}_feed; ipfs key rm ${G1PUB};
@@ -72,7 +72,7 @@ mkdir -p ~/.zen/tmp/${MOATS}
## SEND PLAYER LAST KNOW TW
TW=$(ipfs add -Hq ${INDEX} | tail -n 1)
-${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "
Hello ${PLAYER},
Your TW is unplugged from Astroport : TW ARCHIVE. $(cat ~/.zen/game/players/${PLAYER}/secret.june)