diff --git a/12345.sh b/12345.sh index ffa7b2b5..e2646ebd 100755 --- a/12345.sh +++ b/12345.sh @@ -132,7 +132,8 @@ while true; do ## / CONTACT if [[ $URL == "/" ]]; then echo "/ CONTACT : $HOSTP" - + echo "$HTTPCORS + DING $(date)" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & end=`date +%s` echo " (‿/‿) $myHOST:$PORT / Execution time was "`expr $end - $start` seconds. continue diff --git a/ajouter_media.sh b/ajouter_media.sh index 1c8f444e..8070c12a 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -42,18 +42,16 @@ PLAYER="$2" CHOICE="$3" # Check who is .current PLAYER -[[ ${PLAYER} == "" ]] && PLAYER=$(myPlayer) - [[ ${PLAYER} == "" ]] \ -&& players=($(ls ~/.zen/game/players 2>/dev/null)) \ +&& players=($(ls ~/.zen/game/players | grep -Ev "localhost" 2>/dev/null)) \ && espeak "PLEASE CONNECT A PLAYER" \ && OUTPUT=$(zenity --entry --width 640 --title="=> Astroport" --text="ASTRONAUTE ?" --entry-text=${players[@]}) \ && [[ $OUTPUT ]] && PLAYER=$OUTPUT && rm -f ~/.zen/game/players/.current && ln -s ~/.zen/game/players/$PLAYER ~/.zen/game/players/.current [[ ${PLAYER} == "" ]] \ && ${MY_PATH}/start.sh \ -&& espeak "Astroport Empty. Enter your magic email" \ -&& xdg-open "https://qo-op.com" \ +&& espeak "Astroport Empty. Create your TW" \ +&& xdg-open "http://astroport.localhost" \ && exit 1 PSEUDO=$(myPlayerPseudo) diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index 8339ae6d..59dff8bf 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -164,7 +164,7 @@ YUSER=$(echo $PLAYER | cut -d '@' -f1) # YUSER=geg-la_debrouille LYUSER=($(echo "$YUSER" | sed 's/[^a-zA-Z0-9]/\ /g')) # LYUSER=(geg la debrouille) CLYUSER=$(printf '%s\n' "${LYUSER[@]}" | tac | tr '\n' '.' ) # CLYUSER=debrouille.la.geg. YOMAIN=$(echo $PLAYER | cut -d '@' -f 2) # YOMAIN=super.chez-moi.com -echo "NEXT STYLE GW : https://ipfs.$CLYUSER$YOMAIN.$(myHostName)" +# echo "NEXT STYLE GW : https://ipfs.$CLYUSER$YOMAIN.$(myHostName)" # echo "MY PLAYER API GW : $(myPlayerApiGw)" NID="${myIPFS}" @@ -173,9 +173,6 @@ WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api" [[ $isLAN ]] && NID="http://astroport.localhost:8080" \ && WID="http://astroport.localhost:5001" -#### player ipfs docker -echo "[[ $USER == 'zen' ]] && make player MAIL=$(myPlayer) USER_HOST=$(myPlayerHost)" - #### ### CREATE $NID ADDRESS FOR API & ROUND ROBIN FOR GW @@ -277,10 +274,10 @@ echo "[[ $USER == 'zen' ]] && make player MAIL=$(myPlayer) USER_HOST=$(myPlayerH echo '[{"title":"$:/plugins/astroport/lightbeams/saver/ipns/lightbeam-name","text":"'${PLAYER}_feed'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-name.json echo '[{"title":"$:/plugins/astroport/lightbeams/saver/ipns/lightbeam-key","text":"'${FEEDNS}'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-key.json - echo "TW IPFS GATEWAY" - cat ~/.zen/tmp/${MOATS}/local.gw.json | jq -r - echo "TW IPFS API" - cat ~/.zen/tmp/${MOATS}/local.api.json | jq -r + echo "TW IPFS GATEWAY : $NID" + # cat ~/.zen/tmp/${MOATS}/local.gw.json | jq -r + echo "TW IPFS API : $WID" + # cat ~/.zen/tmp/${MOATS}/local.api.json | jq -r ## ADD SYSTEM TW tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html \ @@ -340,8 +337,8 @@ echo "[[ $USER == 'zen' ]] && make player MAIL=$(myPlayer) USER_HOST=$(myPlayerH echo "${ASTRONAUTENS}" > ~/.zen/game/players/$PLAYER/.playerns - echo "$SALT" > ~/.zen/game/players/$PLAYER/secret.june - echo "$PEPPER" >> ~/.zen/game/players/$PLAYER/secret.june + echo "SALT=$SALT" > ~/.zen/game/players/$PLAYER/secret.june + echo "PEPPER=$PEPPER" >> ~/.zen/game/players/$PLAYER/secret.june echo; echo "Création Clefs et QR codes pour accès au niveau Astroport Ŋ1"; sleep 1 @@ -352,7 +349,13 @@ echo; echo "+ RSS : ${myIPFS}/ipns/${FEEDNS}"; sleep 1 [[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open "${myIPFS}/ipns/${ASTRONAUTENS}" -[[ ! -L ~/.zen/game/players/.current ]] && ln -s ~/.zen/game/players/$PLAYER ~/.zen/game/players/.current +################# PREPARE DOCKERIZATION +rm ~/.zen/game/players/.current +ln -s ~/.zen/game/players/$PLAYER ~/.zen/game/players/.current +. "$MY_PATH/my.sh" + +#### make player ipfs docker +[[ ! $isLAN || $USER == 'zen' ]] && make player MAIL=$(myPlayer) USER_HOST=$(myPlayerHost) # PASS CRYPTING KEY #~ echo; echo "Sécurisation de vos clefs... "; sleep 1