From 3d76bd52435e013e69d47a4b72b848d46c8b828b Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 27 Feb 2024 16:43:26 +0100 Subject: [PATCH] =?UTF-8?q?Set=20Access-Control-Allow-Origin=20::=20---->>?= =?UTF-8?q?>>=20PUT=20"IP"=20in=20"~/.zen/=E2=99=A5Box"=20<=3D=3D>=20"allo?= =?UTF-8?q?w=20Zen=20Station=20remote=20access"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API/QRCODE.sh | 20 +++++++------------- tools/ipfs_config.sh | 4 ++-- tools/my.sh | 3 +-- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/API/QRCODE.sh b/API/QRCODE.sh index f2d06646..6ff463d0 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -660,7 +660,7 @@ echo "IPNS2G1=${IPNS2G1} ZCHK=${ZCHK}" [[ ${ZCHK} == "" && ${#IPNS2G1} -ge 40 && ${QRCODE::4} == "12D3" ]] \ && echo "${PORT} QRCODE IS IPNS ADDRESS : ${myIPFS}/ipns/${QRCODE}" \ && (echo "$HTTPCORS Loading from IPFS" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \ - && echo "PRULS /ipns/${QRCODE} $PORT" && rm -Rf ~/.zen/tmp/${MOATS} \ + && echo "GLUPS /ipns/${QRCODE} $PORT" && rm -Rf ~/.zen/tmp/${MOATS} \ && exit 0 ## TEST G1 TYPE ( try g1_to_ipfs ) @@ -668,7 +668,7 @@ ASTROTOIPNS=$(${MY_PATH}/../tools/g1_to_ipfs.py ${QRCODE} 2>/dev/null) [[ ! ${ASTROTOIPNS} ]] \ && echo "${PORT} INVALID QRCODE : ${QRCODE}" \ && (echo "$HTTPCORS ERROR - INVALID QRCODE : ${QRCODE}" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \ - && echo "PRULS INVALID ${QRCODE} $PORT" && rm -Rf ~/.zen/tmp/${MOATS} \ + && echo "GLUPS INVALID ${QRCODE} $PORT" && rm -Rf ~/.zen/tmp/${MOATS} \ && exit 1 ################################################################################ echo "############################################################################" @@ -689,23 +689,17 @@ echo ">>> ${QRCODE} g1_to_ipfs $ASTROTOIPNS" ########################################### if [[ $VISITORCOINS == "null" || ${ZEN} -lt 10 ]]; then - echo "!! LOW ZEN WALLET ZEN=${ZEN}" + DISPLAY="$DISPLAY +

!! LOW ZEN WALLET ZEN=${ZEN}

" - echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect - echo "

LOW ZEN WARNING

- PLEASE CHARGE... only ${ZEN} ZEN - " >> ~/.zen/tmp/${MOATS}/index.redirect - ( - cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 - echo "BLURP null ZEN $PORT" && rm -Rf ~/.zen/tmp/${MOATS} - ) & - exit 0 + DISPLAY="$DISPLAY

LOW ZEN WARNING

+ PLEASE CHARGE... ${ZEN} ZEN" fi ## WE SEND WALLET AMOUNT DISPLAY ( - echo "$HTTPCORS

${ZCHK}:${QRCODE}

${DISPLAY}

SCAN WALLET

" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 + echo "$HTTPCORS

${QRCODE}:${ZCHK}:

${DISPLAY}

SCAN WALLET

" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 echo "BLURP ${DISPLAY} $PORT" && rm -Rf ~/.zen/tmp/${MOATS} ) & diff --git a/tools/ipfs_config.sh b/tools/ipfs_config.sh index 33d1523b..1e304b64 100755 --- a/tools/ipfs_config.sh +++ b/tools/ipfs_config.sh @@ -40,8 +40,8 @@ ipfs config --json Experimental.P2pHttpProxy true ipfs config --json Swarm.ConnMgr.LowWater 20 ipfs config --json Swarm.ConnMgr.HighWater 40 -[[ ! $isLAN ]] && ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["http://'$myIP':8080", "http://ipfs.localhost:8080", "http://127.0.0.1:8080", "http://127.0.1.1:8080", "https://ipfs.'$(hostname)'.copylaradio.com", "https://ipfs.copylaradio.com" ]' \ - || ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["http://'$myIP':8080", "http://'$(hostname)'.local:8080","http://'$(hostname)':8080", "http://127.0.0.1:8080", "http://ipfs.localhost:8080", "http://127.0.1.1:8080" ]' +[[ ! $isLAN ]] && ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["http://'$myIP':8080", "http://'$(hostname)'.localhost:8080", "http://ipfs.localhost:8080", "http://127.0.0.1:8080", "http://127.0.1.1:8080", "https://ipfs.'$(hostname)'.copylaradio.com", "https://ipfs.copylaradio.com" ]' \ + || ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["http://'$myIP':8080", "http://'$(hostname)'.local:8080","http://'$(hostname)':8080", "http://'$(hostname)'.localhost:8080", "http://127.0.0.1:8080", "http://ipfs.localhost:8080", "http://127.0.1.1:8080" ]' ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods '["PUT", "GET", "POST"]' ipfs config --json API.HTTPHeaders.Access-Control-Allow-Credentials '["true"]' diff --git a/tools/my.sh b/tools/my.sh index af1d1f2b..12b2ded6 100755 --- a/tools/my.sh +++ b/tools/my.sh @@ -470,8 +470,7 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|( myDOMAIN="copylaradio.com" -myASTROPORTW="http://$(hostname).local:1234" #astroport.localhost -myASTROPORT="http://${myIP}:1234" # BE ACCESSIBLE THROUGH LAN +myASTROPORT="http://$(hostname).local:1234" #astroport.localhost myAPI="http://${myIP}:5001" myDATA="https://data.gchange.fr" myGCHANGE="https://www.gchange.fr"