diff --git a/.install/loveland.sh b/.install/loveland.sh index 06813cd..096a1b7 100755 --- a/.install/loveland.sh +++ b/.install/loveland.sh @@ -69,8 +69,8 @@ sudo sed -i "s/_SERVERNAME_/$nodename/g" /etc/nginx/conf.d/loveland.conf if [[ ! -L /var/www/loveland ]]; then sudo ln -s /home/$YOU/.zen/astroport/www/LOVELand /var/www/loveland fi -sudo chmod 777 /var/www/loveland/jukebox/albumart -sudo chmod 777 /var/www/loveland/jukebox/prefs +sudo chmod -R 777 /var/www/loveland/jukebox/albumart +sudo chmod -R 777 /var/www/loveland/jukebox/prefs # Disabling default website sudo rm -f /etc/nginx/sites-enabled/default diff --git a/g1sms/sms_ASTROPORT.sh b/g1sms/sms_ASTROPORT.sh index 61e0e9f..f1e21fc 100755 --- a/g1sms/sms_ASTROPORT.sh +++ b/g1sms/sms_ASTROPORT.sh @@ -18,6 +18,13 @@ YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail IPFSNODEID=$(ipfs id -f='\n') TODAY=$(date '+%Y%m%d') timestamp=$(date -u +%s%N | cut -b1-13) +# VERIFY task relay directory EXISTS and is 777 +# LOCAL MODE +[[ ! -d /tmp/loveland_entrance ]] && mkdir -p /tmp/loveland_entrance && chmod -R 777 /tmp/loveland_entrance +# SWARM TASK MODE +[[ ! -d /home/$YOU/.zen/ipfs/.$IPFSNODEID/TASK/loveland_entrance ]] \ +&& mkdir -p /home/$YOU/.zen/ipfs/.$IPFSNODEID/TASK/loveland_entrance \ +&& chmod -R 777 /home/$YOU/.zen/ipfs/.$IPFSNODEID/TASK/loveland_entrance echo ' ___ __ __ @@ -29,9 +36,11 @@ echo ' Love Land ENTRANCE CHECKING ' +[[ ! $G1SMS == "yes" ]] && echo "I am NOT a G1SMS Node... Can't do nothing... EXIT" && exit 1 -# TODO SWARM MODE TEST and activate ? -#for hashfile in $(ls /home/$YOU/.zen/ipfs_swarm/.Qm*/TASK/loveland_entrance); do +$MY_PATH/ipfs_SWARM_refresh.sh + +for hashfile in $(ls /home/$YOU/.zen/ipfs_swarm/.Qm*/TASK/loveland_entrance); do # PHONE=$(cat $hashfile) # HPHONE=$(basename -- "$hashfile") # echo "We have received Ajax Astroport request from $PHONE" @@ -58,7 +67,7 @@ for hashfile in $(ls /tmp/loveland_entrance/); do [[ $PARRAIN ]] && MEMRIB=$(sms_uid2key "$PARRAIN" "$PHONE" "$PIN") && echo "RIB PARRAIN: $MEMRIB" # CREATE G1 WALLET - .$MY_PATH/sms_NEW.sh "$PHONE" "$PARRAIN" + $MY_PATH/sms_NEW.sh "$PHONE" "$PARRAIN" else # ACCOUNT ALREADY EXISTING @@ -69,7 +78,7 @@ for hashfile in $(ls /tmp/loveland_entrance/); do AMOUNTLOVE=$(bc -l <<< "scale=0; $AMOUNTG1 * 100 / $DUFACTOR") # DOUBLE AUTH SMS !! - ./sms_AUTH.sh "$PHONE" "$PARRAIN" + $MY_PATH/sms_AUTH.sh "$PHONE" "$PARRAIN" mess="Bonjour! Astroport Station" @@ -88,13 +97,4 @@ done [[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE -# VERIFY task relay directory EXISTS and is 777 -# LOCAL MODE -[[ ! -d /tmp/loveland_entrance ]] && mkdir -p /tmp/loveland_entrance && chmod -R 777 /tmp/loveland_entrance -# TASK SWARM MODE -[[ ! -d /home/$YOU/.zen/ipfs/.$IPFSNODEID/TASK/loveland_entrance ]] \ -&& mkdir -p /home/$YOU/.zen/ipfs/.$IPFSNODEID/TASK/loveland_entrance \ -&& chmod -R 777 /home/$YOU/.zen/ipfs/.$IPFSNODEID/TASK/loveland_entrance - - exit 0 diff --git a/www/LOVELand/ajaxform.js b/www/LOVELand/ajaxform.js index 06f6381..8eeb3c0 100644 --- a/www/LOVELand/ajaxform.js +++ b/www/LOVELand/ajaxform.js @@ -1,6 +1,7 @@ jQuery(document).ready(function () { var host = window.location.hostname; $('#nodename').html(host); + $("#formphone").submit(function(e) { e.preventDefault(); // avoid to execute the actual submit of the form. console.log("button PHONE clicked"); diff --git a/www/LOVELand/index.html b/www/LOVELand/index.html index a2aeb1d..e49ec57 100644 --- a/www/LOVELand/index.html +++ b/www/LOVELand/index.html @@ -69,7 +69,7 @@
-

Invitation



+

Recevez une Invitation



@@ -88,7 +88,7 @@
-

LIBRE
vers un Futur plus Humain

+

Soyons LIBRE
dirigeons nous vers un Futur plus Humain

@@ -117,7 +117,7 @@

Univers Numérique ancré dans le Réel

Impossible à réaliser jusqu'à aujourd'hui! Nous avons mis au point un système d'information totalement décentralisé. Créé par les Humains qui le compose. - Chacun y est souverain. Forgeron monétaire relié aux Oasis de son réseau d'Amis. + Chacun y est souverain. Forgeron monétaire libre relié aux Oasis de son réseau d'Amis.

Ici nul privilège autre que celui consciemment transmis.

Fabriquez votre clef, évadons-nous ensemble !

@@ -125,7 +125,7 @@
-

Bâtisseurs du Monde Libre

+

Bâtisseurs du "Monde Libre"

Astroport construit un "Metavers" composé du maillage des mini-mondes de chacun. Tous associés, nous partageons nos besoins, nos compétences, nos connaissances.

@@ -255,6 +255,7 @@ typeSpeed: 40 }); - + + diff --git a/www/LOVELand/zen_loveland_entrance.php b/www/LOVELand/zen_loveland_entrance.php index 7194860..4ad1db3 100644 --- a/www/LOVELand/zen_loveland_entrance.php +++ b/www/LOVELand/zen_loveland_entrance.php @@ -17,19 +17,18 @@ if (strlen($_REQUEST['phone']) == 10 ) { // CREATE FILE for POST TREATMENT with sms_ASTROPORT.sh // LOCAL $fp = fopen('/tmp/loveland_entrance/'.$HPHONE, 'w'); - fwrite($fp, $PHONE.'|'.$PARRAIN.'|'.$naissance); -/* - // MODE SWARM Syntax error: ")" unexpected TODO DEBUG - exec("ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d ' ' -f 1)", $YOU, $return); + + fwrite($fp, $PHONE.'|'.$PARRAIN.'|'.$naissance); + + // MODE SWARM : write + $YOU = exec("ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d ' ' -f 1", $output, $return); if ($return == 0) { - print ($YOU); - exec("ipfs id -f='\n'", $IPFSNODEID, $return); + $IPFSNODEID = exec("ipfs id -f='\n'", $output, $return); // ACCESS RIGHT PROBLEM !!! - $fp = fopen('/home/$YOU/.zen/ipfs/.'.$IPFSNODEID.'/TASK/loveland_entrance/'.$HPHONE, 'w'); + $fp = fopen('/home/'.$YOU.'/.zen/ipfs/.'.$IPFSNODEID.'/TASK/loveland_entrance/'.$HPHONE, 'w'); fwrite($fp, $PHONE); } -*/ return true; } else { return false; diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh index 3146467..1a1872e 100755 --- a/zen/ipfs_SWARM_refresh.sh +++ b/zen/ipfs_SWARM_refresh.sh @@ -16,7 +16,8 @@ ME="${0##*/}" # ex: ./'$ME' # SYNC IPFS SWARM PEERS SHARED DATA .Qm**** ########################################################################' - +export YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1); +[[ $YOU == "" ]] && echo "Please run ipfs daemon" && exit 1 ######################################################################## # ENVIRONEMENT DETECTION + IPFS ~/.zen/ipfs/.$ipfsnodeid/G1SSB/_info ######################################################################## @@ -39,23 +40,24 @@ echo "I am $ipfsnodeid" ## CHANNELS SWARM INDEX COPY PROCEDURE ## SIGNAL ~/.zen/g1sms_wallets TODO -# NOW PUBLISH ~/.zen/ipfs/ to SWARM -[[ ! -d ~/.zen/ipfs ]] && echo "ERROR : ~/.zen/ipfs/ NOT FOUND" && exit 1 -IWALLETS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1) +echo "PUBLISHING MY OWN /home/$YOU/.zen/ipfs/ to SWARM" +[[ ! -d /home/$YOU/.zen/ipfs ]] && echo "ERROR : /home/$YOU/.zen/ipfs/ NOT FOUND" && exit 1 +IWALLETS=$(ipfs add -rHq /home/$YOU/.zen/ipfs | tail -n 1) NODEIPNS=$(ipfs name publish --quieter /ipfs/$IWALLETS) -ipfs get --output=~/.zen/ipfs_swarm/ /ipns/$ipfsnodeid +ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$ipfsnodeid +echo "REFRESHING /home/$YOU/.zen/ipfs_swarm/ from my SWARM peers" count=1 # Search for All peers Nodes. ## TODO: To be changed when Swarm is too big or not expanding #for id in $(ls -d ~/.zen/ipfs_swarm/.Qm* | cut -d '.' -f 3); # Alternative search... -for id in $(ipfs swarm peers | awk -F '/' '{print $7}'); +for id in $(ipfs swarm peers | grep 'ip4' | awk -F '/' '{print $7}'); do - count=$((count+1)) # FULL REFRESH (allow deletion, for DEV period) # TODO: COMMENT TO LOWER DISK USAGE - echo "Refreshing ~/.zen/ipfs_swarm/.$id ($count)" - rm -Rf ~/.zen/ipfs_swarm/.$id - $MY_PATH/tools/timeout.sh -t 30 ipfs get --output=~/.zen/ipfs_swarm/ /ipns/$id + echo "Refreshing /home/$YOU/.zen/ipfs_swarm/.$id ($count)" + rm -Rf /home/$YOU/.zen/ipfs_swarm/.$id + $MY_PATH/tools/timeout.sh -t 30 ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$id + count=$((count+1)) done # TODO: TASK treatment.