diff --git a/install.sh b/install.sh index bdcffca2..4825c25e 100755 --- a/install.sh +++ b/install.sh @@ -202,12 +202,17 @@ echo '${TYPE};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ ####################################################################### echo "#############################################" -## https://darktrojan.github.io/openwith/webextension.html" -[[ $XDG_SESSION_TYPE == 'x11' ]] && ~/.zen/Astroport.ONE/open_with_linux.py install; \ - - echo "# BLOB MODE avec 'OpenWith' depuis votre navigateur !!" + ## https://darktrojan.github.io/openwith/webextension.html" + [[ $XDG_SESSION_TYPE == 'x11' ]] && ~/.zen/Astroport.ONE/open_with_linux.py install; \ + echo "#############################################" \ + echo "# NOURRIR SON BLOB" \ + echo "# avec 'OpenWith' depuis votre navigateur !!" \ echo "# https://addons.mozilla.org/firefox/addon/open-with/ -# https://chrome.google.com/webstore/detail/open-with/cogjlncmljjnjpbgppagklanlcbchlno" +# https://chrome.google.com/webstore/detail/open-with/cogjlncmljjnjpbgppagklanlcbchlno" \ + echo "#############################################" \ + echo \ + echo " ## $HOME/.zen/Astroport.ONE/ajouter_media.sh ##" \ + echo \ echo "#############################################" ### ADD 20h12.sh CRON ############### @@ -245,7 +250,7 @@ which youtube-dl echo "#############################################" echo "#############################################" ## Desktop install - echo "Astroport.ONE" + echo "Astroport.ONE INSTALL" end=`date +%s` echo Execution time was `expr $end - $start` seconds. echo "#############################################" @@ -267,7 +272,7 @@ Connectez-vous sur https://gchange.fr avec vos identifiants $(cat ~/.zen/game/players/.current/secret.june) -http://astroport.com +Powered by https://astroport.com " # MAIN # fi diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index 0044f699..c8073852 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -198,10 +198,10 @@ G1PUB=$(cat /tmp/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) sed -i "s~127.0.0.1~$myIP~g" ~/.zen/game/players/$PLAYER/ipfs/moa/index.html # 8080 & 5001 BEING THE RECORDING GATEWAY (WAN or ipfs.localhost) # - echo "# CRYPTO ENCODING myIP -> CRYPTIP" + echo "# CRYPTO ENCODING secret.dunikey -> TW _SECRET_ " echo $myIP > ~/.zen/tmp/myIP - $MY_PATH/natools.py encrypt -p $G1PUB -i $HOME/.zen/tmp/myIP -o $HOME/.zen/tmp/myIP.$G1PUB.enc - CRYPTIP=$(cat ~/.zen/tmp/myIP.$G1PUB.enc | base16) + $MY_PATH/natools.py encrypt -p $G1PUB -i $HOME/.zen/game/players/$PLAYER/secret.dunikey -o $HOME/.zen/tmp/secret.dunikey.$G1PUB.enc + CRYPTIP=$(cat ~/.zen/tmp/secret.dunikey.$G1PUB.enc | base16) sed -i "s~_SECRET_~$CRYPTIP~g" ~/.zen/game/players/$PLAYER/ipfs/moa/index.html # echo "# CRYPTO DECODING CRYPTIP -> myIP" @@ -279,10 +279,10 @@ echo "*** IPNS Ŋ0 KEY : $PLAYER"; echo; echo "GW : http://$myIP:8080/ipns/${ASTRONAUTENS}"; sleep 1 # PASS CRYPTING KEY -echo; echo "Sécurisation de vos clefs par chiffrage SSL... "; sleep 1 -openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/secret.june" -out "$HOME/.zen/game/players/$PLAYER/enc.secret.june" -k $PASS 2>/dev/null -openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/secret.dunikey" -out "$HOME/.zen/game/players/$PLAYER/enc.secret.dunikey" -k $PASS 2>/dev/null -openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/$KEYFILE -out" "$HOME/.zen/game/players/$PLAYER/enc.$KEYFILE" -k $PASS 2>/dev/null +#~ echo; echo "Sécurisation de vos clefs... "; sleep 1 +#~ openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/secret.june" -out "$HOME/.zen/game/players/$PLAYER/enc.secret.june" -k $PASS 2>/dev/null +#~ openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/secret.dunikey" -out "$HOME/.zen/game/players/$PLAYER/enc.secret.dunikey" -k $PASS 2>/dev/null +#~ openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/$KEYFILE -out" "$HOME/.zen/game/players/$PLAYER/enc.$KEYFILE" -k $PASS 2>/dev/null ## TODO MORE SECURE ?! USE opengpg, natools, etc ... # ${MY_PATH}/natools.py encrypt -p $G1PUB -i ~/.zen/game/players/$PLAYER/secret.dunikey -o "$HOME/.zen/game/players/$PLAYER/enc.secret.dunikey" echo