updates
This commit is contained in:
parent
2faccc8a2a
commit
f24e810c7c
|
|
@ -58,7 +58,7 @@ dayofthemonth=$(date +%d)
|
|||
weeknumber=$(date +%V)
|
||||
|
||||
echo $timebar
|
||||
[[ -f ~/.zen/DEFCON ]] && export DEFCON=$(cat ~/.zen/DEFCON) || export DEFCON=$(cat $MY_PATH/DEFCON) # ADAPT $DEFCON scenario
|
||||
[[ -f ~/.zen/DEFCON ]] && export DEFCON=$(cat ~/.zen/DEFCON) || export DEFCON=$(cat ~/.zen/astrXbian/DEFCON) # ADAPT $DEFCON scenario
|
||||
|
||||
# ____ _______ __ __
|
||||
# / __ \/ ____/ | / / ____ ___ ____ ____/ /__
|
||||
|
|
@ -67,7 +67,7 @@ echo $timebar
|
|||
# /_____/_____/ |___/ /_/ /_/ /_/\____/\__,_/\___/
|
||||
#
|
||||
#
|
||||
# ACTIVATE 15 MN "git pull" update
|
||||
# ACTIVATE 15-17 MN "git pull" update
|
||||
if [[ $(($minute % 15)) == 0 ]]; then
|
||||
########## DESYNCH SWARM NODE REQUESTS #################
|
||||
sleep $((1 + RANDOM % 120))
|
||||
|
|
@ -82,7 +82,7 @@ fi
|
|||
#
|
||||
##################################################################
|
||||
#
|
||||
# REFRESH IPFS SWARM DATA EVERY 20 minutes décalé jusqu'à 3 mn
|
||||
# REFRESH IPFS SWARM DATA EVERY 20-23 minutes
|
||||
[[ $(($minute % 20)) == 0 ]] && sleep $((1 + RANDOM % 180)) && $MY_PATH/zen/gchange_INIT.sh && $MY_PATH/zen/gchange_IPFS_swarm.sh &
|
||||
|
||||
#
|
||||
|
|
@ -91,15 +91,17 @@ fi
|
|||
# \ \/ / '_ \| |/ _` | '_ \
|
||||
# > <| |_) | | (_| | | | |
|
||||
# /_/\_\_.__/|_|\__,_|_| |_| ASTROPORT youtube mp3
|
||||
#
|
||||
# Transfert ~/astroport/*/files to IPFS and make Vstream/ASTROPORT indexes on IPNS
|
||||
#
|
||||
# ON Rpi/xbian files added in ~/astroport are monitored to activate "new_file_in_astroport.sh"
|
||||
# Transfert ~/astroport/*/files to IPFS and make Vstream/ASTROPORT indexes in IPNS
|
||||
if [[ "$USER" == "xbian" ]]; then
|
||||
# LAUNCH inotifywait
|
||||
if [[ ! $isinotifywaitRunning ]]; then
|
||||
mkdir -p /home/$YOU/astroport
|
||||
/usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/new_file_in_astroport.sh "$dir" "$file"; done &
|
||||
fi
|
||||
|
||||
# restart inotifywait (may be useless)
|
||||
# RESTART inotifywait (may be useless)
|
||||
if [[ "$timebar" == "03:03" ]]; then
|
||||
killall inotifywait
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ do
|
|||
echo "PIN : $astroipfs"
|
||||
ipfs pin add /ipfs/$astroipfs && mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astroipfs}/
|
||||
echo "PUBLISHING MY PIN"
|
||||
[[ -d ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astroipfs} ]] && touch ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astroipfs}/$G1PUB
|
||||
[[ -d ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astroipfs} ]] && echo "0" > ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astroipfs}/$G1PUB
|
||||
fi
|
||||
# EXIT AFTER ONE PIN ONLY (next PIN in cron_MINUTE time)
|
||||
[[ -f ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astroipfs}/$G1PUB ]] && break
|
||||
|
|
|
|||
|
|
@ -44,12 +44,15 @@ for peerline in $(ipfs swarm peers && cat ~/.zen/A_swarm_map.txt | sort | uniq);
|
|||
do
|
||||
ipfsnodeid=$(echo "$peerline" | awk -F '/' '{print $8}')
|
||||
[[ "$ipfsnodeid" == "" ]] && continue
|
||||
|
||||
# Convert ipfsnodeid into g1pub
|
||||
whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid)
|
||||
|
||||
# control ip isLAN?
|
||||
ip=$(echo "$peerline" | awk -F '/' '{print $3}')
|
||||
isLAN=$(echo $ip | cut -f3 -d '/' | grep -E "(^127\.)|(^192\.168\.)|(^fd42\:)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
|
||||
|
||||
## IS $ipfsnodeid Already Treated ?
|
||||
## $ipfsnodeid already Treated ?
|
||||
[[ $(cat /tmp/treated.ipfs.swarm | grep $ipfsnodeid ) ]] && continue
|
||||
|
||||
nowdate=$(date)
|
||||
|
|
@ -66,7 +69,7 @@ do
|
|||
grep -vEi $ip ~/.zen/A_my_swarm.txt
|
||||
fi
|
||||
else
|
||||
DEFCON=$(cat ~/.zen/astrXbian/DEFCON)
|
||||
[[ -f ~/.zen/DEFCON ]] && export DEFCON=$(cat ~/.zen/DEFCON) || export DEFCON=$(cat ~/.zen/astrXbian/DEFCON) # like in crom_MINUTE.sh
|
||||
echo "!!! NOT MY FRIEND !!! ___________________ # DEFCON : $DEFCON "
|
||||
if [[ ( $DEFCON < 5 ) && ! $isLAN ]]
|
||||
then
|
||||
|
|
|
|||
|
|
@ -59,6 +59,8 @@ echo "-----------------------------------------------------------------"
|
|||
echo "New $TYPE INDEX ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN "
|
||||
[[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/ ]] && mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
|
||||
|
||||
URLENCODE_FILE_NAME=$(echo ${file} | jq -Rr @uri)
|
||||
|
||||
########################################################################
|
||||
## CREATE NEW ipns KEY : TMDB_$TMDB
|
||||
########################################################################
|
||||
|
|
@ -69,9 +71,13 @@ if [[ $KEY ]]; then
|
|||
echo "$KEYFILE" > ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/.ipns.key.keystore_filename
|
||||
echo "$KEY" > ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/.ipns.link
|
||||
touch ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/.zen
|
||||
echo "/ipfs/$IPFSREPFILEID/${file}" > ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/.ipfs.filelink
|
||||
mv ~/astroport/${CAT}/${TMDB}/ajouter_video.txt ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/
|
||||
# echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://localhost:8181/ipns/$KEY/TMDB_$TMDB/${G1PUB}/\">" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/TMDB_$TMDB/ipns.html
|
||||
# TRY NATOOLS FOR SECURE SHARING # $MY_PATH/jaklis/lib/natools.py encrypt -k $G1PUB -i ~/.ipfs/keystore/$KEYFILE -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/TMDB_$TMDB/.ipns.key.encrypt.natools
|
||||
$MY_PATH/tools/natools.py encrypt -p $G1PUB -i ~/.ipfs/keystore/$KEYFILE -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/TMDB_$TMDB/.ipns.key.natools.encrypt
|
||||
$MY_PATH/tools/natools.py encrypt -p $G1PUB -i ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/.ipfs.filelink -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/TMDB_$TMDB/.ipfs.filelink.natools.encrypt
|
||||
rm ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/.ipfs.filelink
|
||||
fi
|
||||
# IPNS index.html Redirect to ipfs streaming link (could be contract or anything !!)
|
||||
echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://localhost:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME\">" > ~/.zen/KEY/TMDB_$TMDB/${G1PUB}/index.html
|
||||
|
|
@ -82,8 +88,6 @@ ipfs name publish --key="TMDB_$TMDB" $NEWIPFS
|
|||
########################################################################
|
||||
########################################################################
|
||||
|
||||
URLENCODE_FILE_NAME=$(echo ${file} | jq -Rr @uri)
|
||||
|
||||
# FIRST ${PREFIX}ASTRXBIAN header
|
||||
[[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue