From e38064829304319c05a119368db617cd239a2fd4 Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 5 Feb 2024 13:28:01 +0100 Subject: [PATCH 1/4] spatio temporal shifting UPlanet IPNS keys --- RUNTIME/REGION.refresh.sh | 2 +- RUNTIME/SECTOR.refresh.sh | 4 ++-- RUNTIME/UPLANET.refresh.sh | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh index 7b28585d..75da4832 100755 --- a/RUNTIME/REGION.refresh.sh +++ b/RUNTIME/REGION.refresh.sh @@ -83,7 +83,7 @@ for REGION in ${REGIONS[@]}; do TODATEREGIONNS=$(ipfs key import ${TODATE}${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv) ############################################################## ## GET from IPNS - ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${REGIONNS}/ + ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${YESTERDATEREGIONNS}/ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> mkdir -p ~/.zen/tmp/${MOATS}/${REGION}/RSS diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 484dd633..0d04e977 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -87,7 +87,7 @@ for SECTOR in ${SECTORS[@]}; do # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> start=`date +%s` # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - #~ ## IPFS GET ONLINE SECTORNS + #~ ## IPFS GET ONLINE YESTERDATE SECTORNS ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${SECTOR}/ /ipns/${YESTERDATENS}/ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> end=`date +%s` @@ -299,7 +299,7 @@ echo "${TODATE && IPFSPOP=$(ipfs add -rwq ~/.zen/tmp/${MOATS}/${SECTOR}/* | tail -n 1) && echo "ROOT was ${ZCHAIN}" ###################################################### - echo "% START PUBLISHING ${SECTOR} ${myIPFS}/ipns/${SECTORNS}" + echo "% START PUBLISHING ${SECTOR} ${myIPFS}/ipns/${TODATENS}" start=`date +%s` ipfs name publish -k ${TODATE}${G1PUB} /ipfs/${IPFSPOP} ipfs key rm ${TODATE}${G1PUB} ${YESYERDATE}${G1PUB} ${G1PUB} > /dev/null 2>&1 diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index 6afd729e..8c746812 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -201,13 +201,13 @@ echo "" > ~/ COINS=$($MY_PATH/../tools/COINScheck.sh ${REGIONG1PUB} | tail -n 1) echo "REGION : ${REGION} (${COINS} G1) WALLET : ${REGIONG1PUB}" - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/REGION.priv "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/REGION.priv "${TODATE}${UPLANETNAME}${REGION}" "${TODATE}${UPLANETNAME}${REGION}" ipfs key rm ${REGIONG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT - REGIONNS=$(ipfs key import ${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv) + TODATEREGIONNS=$(ipfs key import ${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv) ipfs key rm ${REGIONG1PUB} ############################################################## mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON} - echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}/index.html + echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}/index.html # %%%%%%%%%% ################################################## ## COLLECT RSS FROM ALL PLAYERS WITH SAME UMAP IN SWARM MEMORY /UPLANET/__/_*_*/_*.?_*.?/_*.??_*.?? From 68b4628e8200d6d5e02c125094ac79ed8b1dfc0e Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 5 Feb 2024 13:41:28 +0100 Subject: [PATCH 2/4] =?UTF-8?q?=C4=9E1Quest=20+=20Groceliande?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/UPlanetSector/index.html | 2 +- templates/UPlanetUmap/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/UPlanetSector/index.html b/templates/UPlanetSector/index.html index b43cbffb..08886cfd 100644 --- a/templates/UPlanetSector/index.html +++ b/templates/UPlanetSector/index.html @@ -161,7 +161,7 @@ iframe { | _ | | - ( ) + ( ) ( ° - °)📺 |        diff --git a/templates/UPlanetUmap/index.html b/templates/UPlanetUmap/index.html index bbfd8b1a..0bad1946 100644 --- a/templates/UPlanetUmap/index.html +++ b/templates/UPlanetUmap/index.html @@ -155,7 +155,7 @@ iframe { | ♥ (° - ° )📺 | - ( ) + ( )        From 14ef3a1cbe6966f8fde8abb0c76958f348d81caa Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 5 Feb 2024 14:05:19 +0100 Subject: [PATCH 3/4] TODATENS --- README.md | 8 ++++---- RUNTIME/UPLANET.refresh.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fb9be1da..3189bb6f 100644 --- a/README.md +++ b/README.md @@ -366,19 +366,19 @@ GET /?player=${PLAYER}&moa=json&tag=G1CopierYoutube check available "logo.png" in [./images](./images) ## ➤ UPLANET : Create Umap, AstroID & ZenCard for PLAYER (email) -### ```/?uplanet=${PLAYER}&salt=${LAT}&pepper=${LON}&g1pub=${PASS}``` +### ```/?uplanet=${PLAYER}&zlat=${LAT}&zlon=${LON}&g1pub=${PASS}``` | Parameter | Type | Description | | :-------- | :------- | :-------------------------------- | | `uplanet` | `email` | **Required** Your EMAIL token | -| `salt` | `decimal` | **Required** LATITUDE with 2 decimals digits | -| `pepper` | `decimal` | **Required** LONGITUDE with 2 decimals digits | +| `zlat` | `decimal` | **Required** LATITUDE with 2 decimals digits | +| `zlon` | `decimal` | **Required** LONGITUDE with 2 decimals digits | | `g1pub` | `string` | **Facultative** choose Umap AstroID PASS | Create à Umap key (LAT/LON), then a PLAYER TW with GPS as Umap IPNS reference This API is used by OSM2IPFS code. -UPlanet Entrance : https://qo-op.com +* [UPlanet Entrance](https://qo-op.com) ### ➤ QRCODE (API SandBox) ```http diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index 8c746812..e532a004 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -180,7 +180,7 @@ echo "" > ~/ COINS=$($MY_PATH/../tools/COINScheck.sh ${SECTORG1PUB} | tail -n 1) echo "SECTOR : ${SECTOR} (${COINS} G1) WALLET : ${SECTORG1PUB}" - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${SECTOR}.priv "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${SECTOR}.priv "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}" ipfs key rm ${SECTORG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT SECTORNS=$(ipfs key import ${SECTORG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${SECTOR}.priv) ipfs key rm ${SECTORG1PUB} @@ -232,8 +232,8 @@ echo "" > ~/ ################################## ## OSM2IPFS ### UMAP = 0.01° Planet Slice - UMAPGEN="${EARTHCID}/Umap.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}/_index.html" - USATGEN="${EARTHCID}/Usat.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${UMAPNS}/_index.html" + UMAPGEN="${EARTHCID}/Umap.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${TODATENS}/_index.html" + USATGEN="${EARTHCID}/Usat.html?southWestLat=${LAT}&southWestLon=${LON}°=0.01&ipns=${TODATENS}/_index.html" echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/Umap.html echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/Usat.html From 3e9b4a2e81d74032bb798d5f7ff11d1c7132973d Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 5 Feb 2024 14:47:29 +0100 Subject: [PATCH 4/4] nouvelle image --- WWW/favicon.groceliande.png | Bin 0 -> 2975 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 WWW/favicon.groceliande.png diff --git a/WWW/favicon.groceliande.png b/WWW/favicon.groceliande.png new file mode 100644 index 0000000000000000000000000000000000000000..0e47a3fd0b4d2f948572755cf824c5bcccb17421 GIT binary patch literal 2975 zcmV;Q3t;q#P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H13oJ=Q zK~#90<(hkRRK*>~KXdQy&1Ul?FAzk6@(3@XBFH-^o@y%!=b%tZ50zA_wYGAQo{HL| zrQ!oi)z-HhMLZO&+KLB)f}l_=P!JIW0!D&Bd1dq1WRrc}d#8WIO*Y9svm4^k?;m?+ zX6Me#?>E2K{AS>L4iP9678crEHrJ4@T+9W7KspXP_5xS}ZS~grz5=nQ>sECEAu$0J zKxuB%qzL=LcMnRt!uJpYf*By`Gzm~uD9AQDYxs^rY5oC_vh!5HG~qwb)=>JmlNpn| zXja)-Q^k&vO|&-~K}~AH!042@qy(o+FlwNmVSRNL{Zygsgvy$aY;4(UrO|ug%}+mP zKc$@V76wQuMQ16&wO9Dbus4-$nxs#6gFf92iii7gI0ffx6*hmWvHc4x2P-T%8#|vN z9*;+Xpg5plK*4ZRG4~~F0wG|@FIKX)Izrf=Ik6&OI;L`<) z0-8l)vq~zR3UeRJq`}j1MyZ;bes2G{h8791N|8(rkP<%mLSy;_UrfXUq}e2Cw#fG3 zLD-Wf>elt70T*_uM|g!3qmEJ&?_@Git(XGrY!y@dDcq zSSg;L&1)M{`TCq1x50D!1Qlmgmaefg<#*YfawI2oG1JY~HXyGkZzRyEp>T>OnRL0I zpIq&ssJB5{s>G^7s!d{1!RrIRF3=5dc?4gdQ(3(wh0+}<=xwwpFWcmzZYBpRETJch z0-x&3tvgs(-LbDb2(M4DX^+OHJsJR36}opb>6vd}vw*X)$p}`}E7Uc#mlQ>Ti9`L& z{h@~&#&}UxnEj_rKHRIty_R%;x>847iyK7JX>Kqa{05wIC{e}Qs>0049`2p#rguSW zOa0WZT}=FKH)=yLED{Xk0@;8>AOzep*~`x7YIyo?S3BYXdgPcqcDpO?v1Mu#y)6=8 zLE&2zu8$h1^GJz{D+cIM``%pa<^4SxYqzJwJx@yp%$PW|=IW*T5~4yoff- zS+m8)!z=C7Hz*9hOy{m?Zl;d)0 zEw|wHwO`^p+gil_$^kl0+~I1+yhvyBnDur$tCX;0Lo3qaJ|lc<+~E3M8m0dYAJ7zJo7^*_ zu~plgDITsF;bYE{OcuTv-vKE=Z?gcU<)`%l=Eb}4WTJGJ#-$gT47w!rv2@}vKZE-i zT-wv%{yB{x1tm{ra`;620j!XSN#oG*jz{wDRJRU6Ho#B}L+NS`(3D4bY_*+Ar_w6IGYr_UTjTk)sq8MZCOnVo zRt*SZfG~yeEubH03W3j5DY$(CO_i+LY~$&-?VPMk-U4k|w$>6Lgy@t&ShGrc<(hQM zlz9E{7b8;}3D8!S1xTkpNW~(o8IE(<8^^ z%7K1H7wL@buhTQ%pvtLG+aRcKP%urfr%G0Cw6S4Vi^cEP%i!nNd6;#zr(GblZfE>Q z-B?gwUfxCmbYV&*eg+Kbt249M%hWMGF6nM?=(vT|TT*!I<21@nSn!81=;^5v%>q6h zmXtJb`&4(>=q)o%CY=8Z0~3N6;8*>IDq{PQLeccxJCWCovq z72Pts+${vvHi(F!>s3X5-u)!$DqsK-f*7Faia`|mQ#8rl)7;!S%}sV%leE;h1b01^ z(V?siz>4>6%%9;7ds}q%h)!bw5bOpmMx#ZB-@PGybzWLf&%ldYWZI|0ti@S;_GQQY zaivq?ooy-1p5h7l|Kt%qglKY)Nkp@MZT2g|D{8~_9??%{?IX@s!~?9}Y)gpv0A5^Y z3;SQsJd-hlVn5u(2xp+s%z&C>HT8h6ZBNYtFU+qe%iewqKHirc3w`Lgg@5l4AKc8o z#+#IRf>0eO1VA6p4i{4==TjscYiEB6V+ra=8%jlu`JBm4VDZ*wJ0KTn(sACC(G!}=zq zatAAqR(=xP5K_SwYWS4n$5v4d`v~`l32gwZxbZ?Kw?-#~)BtWb4^0+ct(Z@w%eV2bwdJ551Ze z)*0E1gQzjfj8;%FD~!8LO}g=W%$P_FQ{4f~f%KYZU}A zAwpybP}tpM!VsMeyHfCkxXOx##U%|C_Gm8!Qo=pYrL#YVd_xF)=qPjiKGYu(gL%gh z$BPpAcA)kv@dy3&u-94-zn<2i>u)5rrf$xojqV2!^)w@- zC;>hL&`p@PG$W#=4q!lUgAe~)%a5*#-FLUW`GKZKQg=R;!Sib)8{#l95zMVFuRay7 zLsUu{s~UaweEWOA%|N!>E7-bEW7>Eh_9!Pbn-!*y_hL_x>^P`lM6hqyT;XHU?8a8< zv3=zh<}Ar%TbSrD8l;ems>-TfjnpS*CCwg`-N%AuGm^^y1{do5Yq67@jMxlb#aWd< zu1I73uJ*)SIY8&{e{eQugzFjvPrhmAmD1F9m!WZBnWN0HFj}X$tW?g>oZgDAYyt)X z47$W%)q_rYM>sLI#j!Ign?BX3IISWS$(SOY8^?K36!3TjufA{NnRo0|*LOS zU0aaQths}8rwCK504|26H$D%|ZJu*? z>G;1*5Sc?Vb2MFBil77#DVpTEQ9g$DF;FcMms?PATIJ9Q3r9~T{>V8P0#PNAiyUQ+ z<%IF`(Z@&<3W^HGnbLd?!H8sy8387++>7`A`m*|}L