diff --git a/zen/ipns_TAG_refresh.sh b/zen/ipns_TAG_refresh.sh
index e41ba6b..7d983a3 100755
--- a/zen/ipns_TAG_refresh.sh
+++ b/zen/ipns_TAG_refresh.sh
@@ -77,15 +77,16 @@ do
[[ -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${id}/${G1PUB}/.ipfs.filelink.natools.encrypt ]] && $MY_PATH/tools/natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${id}/${G1PUB}/.ipfs.filelink.natools.encrypt" -o "/tmp/${id}_filelink.txt"
# file=$(cat /tmp/${id}_filelink.txt | rev | cut -d '/' -f 1 | rev)
- IPFSTUBELINK="http://127.0.0.1:8181$(cat /tmp/${id}_filelink.txt)"
- MIMETYPE="video/${IPFSTUBELINK##*.}"
+ TUBELINK="https://tube.copylaradio.com$(cat /tmp/${id}_filelink.txt)"
+ LOCALTUBELINK="http://127.0.0.1:8181$(cat /tmp/${id}_filelink.txt)"
+ MIMETYPE="video/${LOCALTUBELINK##*.}"
[[ "$MIMETYPE" == "video/avi" ]] && MIMETYPE="video/x-msvideo"
### IPNS LINK CAN EVOLVE (REFRESH EVERY 12 H TO MAINTAIN ALIVE IN THE SWARM) # TODO : Use templating
### This index.html is ipns link root, 1st welcome page for MEDIAKEY -> *** Redirect to CONTRACTS processing HERE ***
echo "
-LECTURE LOCALHOST ! Lancement de la video dans 10 secondes ...
+LECTURE LOCALHOST ! Lancement de la video dans 10 secondes ...
Démonstration du service Video Club du Datacenter P2P Libre et Légal.
Essayez astrXbian BETA Live TEstNET
Faites un DON au Media (${id}) ou son Auteur
@@ -122,7 +123,7 @@ Démonstration du service Video Club du Datacenter P2P Libre et Légal.
-
+
$TITLE
diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh
index 38ffd9f..ef7197d 100755
--- a/zen/new_file_in_astroport.sh
+++ b/zen/new_file_in_astroport.sh
@@ -214,9 +214,8 @@ $MY_PATH/tools/natools.py privkey -f ipfs-keystore -k $HOME/.ipfs/keystore/$KEYF
PubFromDunikey=$(cat /tmp/${MEDIAKEY}.dunikey | grep "pub" | cut -d ' ' -f2)
qrencode -s 6 -o "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/QR.png" "$PubFromDunikey"
-
########################################################################
-## MEDIAKEY => DUNIKEY / 6 DIGITS openssl protection
+## MEDIAKEY => DUNIKEY + PASS 6 DIGITS openssl protection
########################################################################
PASS=$(echo "000000${RANDOM:0:6}" | tail -c-7) && echo "$PASS" > /tmp/${MEDIAKEY}.pass
openssl enc -aes-256-cbc -salt -in /tmp/${MEDIAKEY}.dunikey -out "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/dunikey.enc" -k $PASS
@@ -229,9 +228,8 @@ $MY_PATH/tools/natools.py encrypt -p $PINnode -i /tmp/${MEDIAKEY}.pass -o $HOME/
# ~/.zen/astrXbian/zen/tools/natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.pass.encrypt" -o "/tmp/${MEDIAKEY}.pass"
# openssl enc -aes-256-cbc -d -in "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/dunikey.enc" -out "/tmp/${MEDIAKEY}.dunikey" -k $(cat "/tmp/${MEDIAKEY}.pass")
-
########################################################################
-## PREPARE .ipns.mediakey.encrypt FOR PINnode TO BE ABLE TO REFRESH MEDIAKEY
+## GET .ipfs/keystore file MAHE .ipns.mediakey.encrypt
# used in ipns_TAG_refresh.sh & autoPINfriends.sh
########################################################################
$MY_PATH/tools/natools.py encrypt -p $G1PUB -i $HOME/.ipfs/keystore/$KEYFILE -o $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipns.mediakey.encrypt
diff --git a/zen/tools/autoPINfriends.sh b/zen/tools/autoPINfriends.sh
index c9513a7..1bcb4f9 100755
--- a/zen/tools/autoPINfriends.sh
+++ b/zen/tools/autoPINfriends.sh
@@ -45,7 +45,7 @@ do
$MY_PATH/natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "$HOME/.zen/ipfs_swarm/.${ipfsnodesource}/KEY/${mediakey}/${g1source}/${G1PUB}/.ipns.mediakey.encrypt" -o "/tmp/ipns.mediakey"
if [[ -f /tmp/ipns.mediakey ]]; then
## FIND ipns key file name
- KEYFILE=$(ipfs key list | grep "${mediakey}")
+ KEYFILE=$(ipfs key list | grep "${mediakey}") ## BUG !! THIS IS NOT FILE NAME !!
if [[ ! $KEYFILE ]]; then
KEY=$(ipfs key gen "${mediakey}")
KEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1)