From 07db104b03e1d47d7809d295d9a4216433611940 Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 18 Apr 2022 16:09:28 +0200 Subject: [PATCH] changing ipfs gateway port to 8080 --- .../plugin.video.vstream/resources/sites/astroport.py | 2 +- .install/ipfs_alone.sh | 4 +++- .install/nvh/vhost.txt | 4 ++-- .install/nvh/vhost_php.txt | 4 ++-- .install/templates/nginx/astrxbian.conf | 4 ++-- .install/templates/nginx/jukebox.conf | 4 ++-- .install/templates/tiddlyone/index.html | 6 +++--- README.md | 2 +- actions/p4n.data_evolution.sh | 2 +- actions/p4n.swarmscraper.sh | 2 +- ajouter_video.sh | 2 +- install_www.sh | 2 +- nginx.conf | 4 ++-- www/boris/install.sh | 4 ++-- zen/gchange_INIT.sh | 2 +- zen/ipfs_SWARM_refresh.sh | 4 ++-- zen/ipns_TAG_refresh.sh | 10 +++++----- zen/ipns_self_publish.sh | 2 +- zen/manage_stargates.sh | 12 ++++++------ zen/new_file_in_astroport.sh | 16 ++++++++-------- zen/new_mp3_in_astroport.sh | 4 ++-- zen/refresh_ASTRXBIAN_index.sh | 2 +- zen/stream/process-stream.sh | 2 +- zen/tools/MEDIAKEY_dunikey_pass_QR.sh | 2 +- zen/tools/autoPINfriends.sh | 2 +- 25 files changed, 53 insertions(+), 51 deletions(-) diff --git a/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py b/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py index 1f89c63..b3ab66d 100644 --- a/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py +++ b/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py @@ -31,7 +31,7 @@ SITE_IDENTIFIER = 'astroport' SITE_NAME = 'ASTROPORT _PROFIL_ (_LOGIN_) (_MDP_)' SITE_DESC = 'Partage ~/astroport/films (animes, series) avec ses amis https://gchange.fr (https://cesium.app ) via IPFS' -URL_MAIN = 'http://127.0.0.1:8181/ipns/_IPFSNODEID_/._IPFSNODEID_/' +URL_MAIN = 'http://127.0.0.1:8080/ipns/_IPFSNODEID_/._IPFSNODEID_/' KEY_PASTE_ID = 'PASTE_ID' SETTING_PASTE_ID = SITE_IDENTIFIER + '_id_' diff --git a/.install/ipfs_alone.sh b/.install/ipfs_alone.sh index d058fe9..eb031cd 100755 --- a/.install/ipfs_alone.sh +++ b/.install/ipfs_alone.sh @@ -126,7 +126,9 @@ ipfs config --json Experimental.Libp2pStreamMounting true ipfs config --json Experimental.P2pHttpProxy true ipfs config --json Swarm.ConnMgr.LowWater 0 ipfs config --json Swarm.ConnMgr.HighWater 0 -######### CLEAN DEFAULT BOOTSTRAP TO STAY INVISIBLE ########### +ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["*"]' +ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods '["PUT", "GET", "POST"]' +ipfs config --json API.HTTPHeaders.Access-Control-Allow-Credentials '["true"]'######### CLEAN DEFAULT BOOTSTRAP TO STAY INVISIBLE ########### ipfs bootstrap rm --all ########################################### # BOOTSTRAP NODES ARE ADDED LATER diff --git a/.install/nvh/vhost.txt b/.install/nvh/vhost.txt index 0ee3770..2eb4b6d 100644 --- a/.install/nvh/vhost.txt +++ b/.install/nvh/vhost.txt @@ -18,13 +18,13 @@ server { } location /ipfs { - proxy_pass http://127.0.0.1:8181; + proxy_pass http://127.0.0.1:8080; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $remote_addr; } location /ipns { - proxy_pass http://127.0.0.1:8181; + proxy_pass http://127.0.0.1:8080; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $remote_addr; } diff --git a/.install/nvh/vhost_php.txt b/.install/nvh/vhost_php.txt index fb94988..991bea3 100644 --- a/.install/nvh/vhost_php.txt +++ b/.install/nvh/vhost_php.txt @@ -28,13 +28,13 @@ server { } location /ipfs { - proxy_pass http://127.0.0.1:8181; + proxy_pass http://127.0.0.1:8080; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $remote_addr; } location /ipns { - proxy_pass http://127.0.0.1:8181; + proxy_pass http://127.0.0.1:8080; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $remote_addr; } diff --git a/.install/templates/nginx/astrxbian.conf b/.install/templates/nginx/astrxbian.conf index 7bfba67..d650062 100644 --- a/.install/templates/nginx/astrxbian.conf +++ b/.install/templates/nginx/astrxbian.conf @@ -9,13 +9,13 @@ server { # IPFS GATEWAY PROXY location /ipfs { - proxy_pass http://127.0.0.1:8181; + proxy_pass http://127.0.0.1:8080; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $remote_addr; } location /ipns { - proxy_pass http://127.0.0.1:8181; + proxy_pass http://127.0.0.1:8080; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $remote_addr; } diff --git a/.install/templates/nginx/jukebox.conf b/.install/templates/nginx/jukebox.conf index d28d429..94e0ce9 100644 --- a/.install/templates/nginx/jukebox.conf +++ b/.install/templates/nginx/jukebox.conf @@ -28,13 +28,13 @@ server { # IPFS GATEWAY PROXY location /ipfs { - proxy_pass http://127.0.0.1:8181; + proxy_pass http://127.0.0.1:8080; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $remote_addr; } location /ipns { - proxy_pass http://127.0.0.1:8181; + proxy_pass http://127.0.0.1:8080; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $remote_addr; } diff --git a/.install/templates/tiddlyone/index.html b/.install/templates/tiddlyone/index.html index d427e5d..e8d7a2e 100644 --- a/.install/templates/tiddlyone/index.html +++ b/.install/templates/tiddlyone/index.html @@ -14247,9 +14247,9 @@ https://astroport.com
-
''[[Ouvrez mon WIKI|http://127.0.0.1:8181/ipns/_IPFSNODEID_/._IPFSNODEID_]]''
+
''[[Ouvrez mon WIKI|http://127.0.0.1:8080/ipns/_IPFSNODEID_/._IPFSNODEID_]]''
 
-''[[Découvrez mes amis|http://127.0.0.1:8181/ipns/_IPFSNODEID_/._IPFSNODEID_/FRIENDS]]''  dans ma toile de confiance distribuée.
+''[[Découvrez mes amis|http://127.0.0.1:8080/ipns/_IPFSNODEID_/._IPFSNODEID_/FRIENDS]]''  dans ma toile de confiance distribuée.
 
 Répondez à mes ''[[petites annonces sur Gchange|https://www.gchange.fr/#/app/user/_G1PUB_/]]''
 
@@ -14265,7 +14265,7 @@ Chaque Station [[Astroport|Astroport]] possède le sien. Il est publié sur le r
 
 ```
 IPFSNODEID=$(ipfs --timeout=20s id -f='<id>\n')
-xdg-open http://127.0.0.1:8181/ipns/$IPFSNODEID/.$IPFSNODEID/
+xdg-open http://127.0.0.1:8080/ipns/$IPFSNODEID/.$IPFSNODEID/
 ```
 
 Vous pouvez le modifier et enregistrer vos modification dans
diff --git a/README.md b/README.md
index b3a7401..891e7f4 100644
--- a/README.md
+++ b/README.md
@@ -199,7 +199,7 @@ Chaque noeud conserve la mémoire de sa bibliothèque au travers du fichier ```~
 et transmet à Kodi l'ensemble de des "film" dans ```~/.zen/ipfs/.$IPFSNODEID/FASTRXBIAN``` (PREFIX = F), selon le format
 ```
 CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS
-film;$TMDB;2013;Frequencies;;["Science fiction","Romance","Mystere"];$XZUID;480p;http://127.0.0.1:8181/ipfs/QmcXMAHbFH3gDwmxJRX7uh753oCbXAEajwQsAWFkvqbRY3/Frequencies.mp4
+film;$TMDB;2013;Frequencies;;["Science fiction","Romance","Mystere"];$XZUID;480p;http://127.0.0.1:8080/ipfs/QmcXMAHbFH3gDwmxJRX7uh753oCbXAEajwQsAWFkvqbRY3/Frequencies.mp4
 # FORMAT DU FICHIER : https://github.com/Kodi-vStream/venom-xbmc-addons/wiki/Voir-et-partager-sa-biblioth%C3%A8que-priv%C3%A9e#d%C3%A9clarer-des-films
 
 ```
diff --git a/actions/p4n.data_evolution.sh b/actions/p4n.data_evolution.sh
index aa3da1e..20e95a5 100755
--- a/actions/p4n.data_evolution.sh
+++ b/actions/p4n.data_evolution.sh
@@ -41,7 +41,7 @@ fi
             echo "" >  ~/.zen/ipfs/.$IPFSNODEID/astroport/map/p4n/lieu/$lid/index.html
             # mv ./output.pdf  ~/.zen/ipfs/.$IPFSNODEID/astroport/map/p4n/lieu/$lid/bulle.pdf
             rm ~/.zen/ipfs/.$IPFSNODEID/astroport/map/p4n/lieu/$lid/bulle.pdf 2>/dev/null
-            echo "NOW LIEU redirect to http://127.0.0.1:8181/ipfs/$IPFSREPFILEID/$lid.jpg"
+            echo "NOW LIEU redirect to http://127.0.0.1:8080/ipfs/$IPFSREPFILEID/$lid.jpg"
             cat ~/.zen/ipfs/.$IPFSNODEID/astroport/map/p4n/lieu/$lid/index.html
 
     done
diff --git a/actions/p4n.swarmscraper.sh b/actions/p4n.swarmscraper.sh
index 9d92520..16a28ac 100755
--- a/actions/p4n.swarmscraper.sh
+++ b/actions/p4n.swarmscraper.sh
@@ -150,7 +150,7 @@ echo "SUB-SCRAPING lieu FROM $geodata"
             echo "" >  ~/.zen/ipfs/.$IPFSNODEID/astroport/map/p4n/lieu/$lid/index.html
             # mv ./output.pdf  ~/.zen/ipfs/.$IPFSNODEID/astroport/map/p4n/lieu/$lid/bulle.pdf
             rm ~/.zen/ipfs/.$IPFSNODEID/astroport/map/p4n/lieu/$lid/bulle.pdf 2>/dev/null
-            echo "NOW LIEU redirect to http://127.0.0.1:8181/ipfs/$IPFSREPFILEID/$lid.jpg"
+            echo "NOW LIEU redirect to http://127.0.0.1:8080/ipfs/$IPFSREPFILEID/$lid.jpg"
             rm ./$lid.jpg
             rm ./bulle.jpg
         fi
diff --git a/ajouter_video.sh b/ajouter_video.sh
index 6b15805..45ef817 100755
--- a/ajouter_video.sh
+++ b/ajouter_video.sh
@@ -581,7 +581,7 @@ MEDIAPUBKEY=$(cat $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/MEDIAPUBKEY)
 #[ ! $2 ] && zenity --width=500 --height=500 --text-info \
 #       --title="QR CODE MEDIA ${MEDIAKEY} (PASS=$(cat /tmp/${MEDIAKEY}.pass))" \
 #       --html \
-#       --url="http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/KEY/${MEDIAKEY}/QR.png" \
+#       --url="http://127.0.0.1:8080/ipns/${IPFSNODEID}/.${IPFSNODEID}/KEY/${MEDIAKEY}/QR.png" \
 #       --checkbox="Je m'engage à respecter les auteurs et promet d'offrir la Monnaie Libre collectée à qui de droit."
 
 ########################################################################
diff --git a/install_www.sh b/install_www.sh
index 1953868..e852761 100755
--- a/install_www.sh
+++ b/install_www.sh
@@ -9,7 +9,7 @@ fi
 sudo usermod -a -G "$USER" www-data
 sudo chmod g+rw /var/www/html
 
-## TODO ## INSTALLER SITE PROXY NGINX QUI REDIRIGE VERS https://127.0.0.1:8181/ipns/$IPFSNODEID/.$IPFSNODEID
+## TODO ## INSTALLER SITE PROXY NGINX QUI REDIRIGE VERS https://127.0.0.1:8080/ipns/$IPFSNODEID/.$IPFSNODEID
 # STRUCTURE DE DONNEE SITUE DANS ~/.zen/ipfs/ PUBLIEE PAR IPNS SELF
 
 ## AJOUT ADDONS NAVIGATEUR https://askubuntu.com/questions/73474/how-to-install-firefox-addon-from-command-line-in-scripts
diff --git a/nginx.conf b/nginx.conf
index f6ebade..2386738 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -25,13 +25,13 @@ server {
 
 
     location /ipfs {
-        proxy_pass http://127.0.0.1:8181;
+        proxy_pass http://127.0.0.1:8080;
         proxy_set_header Host            $host;
         proxy_set_header X-Forwarded-For $remote_addr;
     }
 
     location /ipns {
-        proxy_pass http://127.0.0.1:8181;
+        proxy_pass http://127.0.0.1:8080;
         proxy_set_header Host            $host;
         proxy_set_header X-Forwarded-For $remote_addr;
     }
diff --git a/www/boris/install.sh b/www/boris/install.sh
index f0198b5..32d63c4 100755
--- a/www/boris/install.sh
+++ b/www/boris/install.sh
@@ -63,13 +63,13 @@ printf ";
     }
 
     location /ipfs {
-        proxy_pass http://127.0.0.1:8181;
+        proxy_pass http://127.0.0.1:8080;
         proxy_set_header Host            $host;
         proxy_set_header X-Forwarded-For $remote_addr;
     }
 
     location /ipns {
-        proxy_pass http://127.0.0.1:8181;
+        proxy_pass http://127.0.0.1:8080;
         proxy_set_header Host            $host;
         proxy_set_header X-Forwarded-For $remote_addr;
     }
diff --git a/zen/gchange_INIT.sh b/zen/gchange_INIT.sh
index e8887a9..b7ffe07 100755
--- a/zen/gchange_INIT.sh
+++ b/zen/gchange_INIT.sh
@@ -120,7 +120,7 @@ sed -i "s/_UPDATED_/$updated/g" $wiki
 
 ## CREATE IPFSNODEID G1PUB QR CODE
 [[ ! -f /home/$YOU/.zen/ipfs/.$IPFSNODEID/QR.png ]] && qrencode -s 6 -o "/home/$YOU/.zen/ipfs/.$IPFSNODEID/QR.png" "$G1PUB"
-# sed -i "s/Personnalisez/Amis de/g" $wiki
+# sed -i "s/Personnalisez/Amis de/g" $wiki
 
 # https:\/\/www.gchange.fr\/#\/app\/records\/wallet?q=$G1PUB
 ########################################################################
diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh
index 025c928..7ad3069 100755
--- a/zen/ipfs_SWARM_refresh.sh
+++ b/zen/ipfs_SWARM_refresh.sh
@@ -282,7 +282,7 @@ AXID=$(cat ~/.zen/ipfs/.$IPFSNODEID/_xbian.zuid);
 
 for PREFIX in F S A Y
 do
-    echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+    echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8080" > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
     cat ~/.zen/ipfs_swarm/.12D*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sed "s/anime;/film;/g" | sed '/^[[:space:]]*$/d' | grep -Ev "CAT;TMDB" | sort | uniq >> ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 done
 
@@ -342,7 +342,7 @@ echo "
  • " >> ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/index.html done diff --git a/zen/ipns_TAG_refresh.sh b/zen/ipns_TAG_refresh.sh index 4b1d4ec..acf70c5 100755 --- a/zen/ipns_TAG_refresh.sh +++ b/zen/ipns_TAG_refresh.sh @@ -59,7 +59,7 @@ do # [[ ! $(echo "${mediakey}" | grep "TMDB_") ]] && continue ## REFRESH ONLY TMDB (level 1), youtube is level 0 IPNSLINK=$(ipfs key list -l | grep ${mediakey} | cut -d ' ' -f 1) [[ "${IPNSLINK}" == "" ]] && continue ## prevent empty IPNSLINK - echo "We are refreshing http://127.0.0.1:8181/ipns/${IPNSLINK}" + echo "We are refreshing http://127.0.0.1:8080/ipns/${IPNSLINK}" count=$((count+1)) && echo "$count) " FILE_NAME=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/.ipfs.filename) TITLE=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/.title) @@ -99,7 +99,7 @@ do ZENBALANCE=$(echo "100 * $BALANCE" | bc -l | cut -d '.' -f 1) TUBELINK="https://tube.copylaradio.com$(cat /tmp/${mediakey}_filelink.txt)" - LOCALTUBELINK="http://127.0.0.1:8181$(cat /tmp/${mediakey}_filelink.txt)" + LOCALTUBELINK="http://127.0.0.1:8080$(cat /tmp/${mediakey}_filelink.txt)" ### IPNS LINK CAN EVOLVE (REFRESH EVERY 12 H TO MAINTAIN ALIVE IN THE SWARM) ### This index.html is ipns link root, 1st welcome page for MEDIAKEY -> *** Redirect to CONTRACTS or LOGIN processing HERE *** @@ -131,7 +131,7 @@ do ## THIS MAKES FRENCH COPY RIGHT LAW RESPECT ## LOCALHOST REDIRECT FOR INTERNAL KODI DEFCON 3 (swarm.key) ASTROPORT STATION MODE - # echo "" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/index.html + # echo "" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/index.html # echo "" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${mediakey}/${G1PUB}/index.html ## DEMO PERIOD @@ -197,7 +197,7 @@ do echo "$id REFRESHED ${I} https://tube.copylaradio.com/ipns/$J - http://127.0.0.1:8181/ipns/$J" + http://127.0.0.1:8080/ipns/$J" ######################################################################## ######################################################################## break ## ONE BY ONE (cron_MINUTE.sh task every 7 mn) @@ -242,7 +242,7 @@ for ipnslink in $(ls ~/.zen/PIN/*/IPNSLINK 2>/dev/null | shuf ); do echo "$id PIN PUBLISH REFRESHED /ipfs/$NEWIPFS https://tube.copylaradio.com/ipns/$ipnsid - http://127.0.0.1:8181/ipns/$ipnsid" + http://127.0.0.1:8080/ipns/$ipnsid" rm -Rf /tmp/${mediakey} diff --git a/zen/ipns_self_publish.sh b/zen/ipns_self_publish.sh index 0c9074e..9242304 100755 --- a/zen/ipns_self_publish.sh +++ b/zen/ipns_self_publish.sh @@ -24,7 +24,7 @@ echo "Adding ~/.zen/ipfs to IPFS" NODEIPNS=$(ipfs --timeout=180s name publish --quieter /ipfs/$MIPFS) echo "$NODEIPNS:TIME:$(cat ~/.zen/ipfs/.${IPFSNODEID}/.timestamp):CHAIN:$(cat ~/.zen/ipfs/.${IPFSNODEID}/.chain)" # fi -echo "PUBLISHED ~/.zen/ipfs TO http://127.0.0.1:8181/ipns/$IPFSNODEID" +echo "PUBLISHED ~/.zen/ipfs TO http://127.0.0.1:8080/ipns/$IPFSNODEID" ######################################################################## ## READ BLOCK CHAIN ## # TIME=$(ipfs cat /ipns/${IPFSNODEID}/.${IPFSNODEID}/.timestamp) diff --git a/zen/manage_stargates.sh b/zen/manage_stargates.sh index 80495dc..7dca797 100755 --- a/zen/manage_stargates.sh +++ b/zen/manage_stargates.sh @@ -39,11 +39,11 @@ else fi echo "******************************************************************" -echo "STARGATE1 http://127.0.0.1:8181/ipns/$(cat ~/.zen/key/1/stargate)" -echo "STARGATE2 http://127.0.0.1:8181/ipns/$(cat ~/.zen/key/2/stargate)" -echo "STARGATE3 http://127.0.0.1:8181/ipns/$(cat ~/.zen/key/3/stargate)" -echo "STARGATE4 http://127.0.0.1:8181/ipns/$(cat ~/.zen/key/4/stargate)" -echo "STARGATE5 http://127.0.0.1:8181/ipns/$(cat ~/.zen/key/5/stargate)" +echo "STARGATE1 http://127.0.0.1:8080/ipns/$(cat ~/.zen/key/1/stargate)" +echo "STARGATE2 http://127.0.0.1:8080/ipns/$(cat ~/.zen/key/2/stargate)" +echo "STARGATE3 http://127.0.0.1:8080/ipns/$(cat ~/.zen/key/3/stargate)" +echo "STARGATE4 http://127.0.0.1:8080/ipns/$(cat ~/.zen/key/4/stargate)" +echo "STARGATE5 http://127.0.0.1:8080/ipns/$(cat ~/.zen/key/5/stargate)" echo "******************************************************************" ######################################################################## @@ -91,7 +91,7 @@ for friendgate in $(ls -d ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/*/); do ;; esac ls ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/ - echo "http://127.0.0.1:8181/ipns/$IPFSNODEID/.$IPFSNODEID/FRIENDS/$fg1pub/" + echo "http://127.0.0.1:8080/ipns/$IPFSNODEID/.$IPFSNODEID/FRIENDS/$fg1pub/" echo "" done diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index efda565..c043d27 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -19,7 +19,7 @@ IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID) [[ ! $IPFSNODEID ]] && echo 'ERROR missing IPFS Node id !! IPFS is not responding !?' && exit 1 G1PUB=$(cat ~/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) # ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN -# Astropot/Kodi/Vstream source reads ${PREFIX}ASTRXBIAN from http://127.0.0.1:8181/.$IPFNODEID/ +# Astropot/Kodi/Vstream source reads ${PREFIX}ASTRXBIAN from http://127.0.0.1:8080/.$IPFNODEID/ # Index File Format (could be enhanced) is using Kodi TMDB enhancement # https://github.com/Kodi-vStream/venom-xbmc-addons/wiki/Voir-et-partager-sa-biblioth%C3%A8que-priv%C3%A9e#d%C3%A9clarer-des-films ######################################################################## @@ -283,7 +283,7 @@ rm /tmp/.ipfsid ## EXPLANATIONS ######################################################################## # What is being in ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ -# is published on http://127.0.0.1:8181/ipns/$KEY/ AND ipfs ls /ipns/$KEY/ +# is published on http://127.0.0.1:8080/ipns/$KEY/ AND ipfs ls /ipns/$KEY/ ######################################################################## ######################################################################## # CONTRACTS, are small App (fulljs or jquery + nginx backend app server) @@ -332,13 +332,13 @@ IPNSLINK=$(ipfs key list -l | grep ${MEDIAKEY} | cut -d ' ' -f 1) > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/index.html -# echo "" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/index.html +# echo "" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/index.html ######################################################################## ## MODIFY INTO "./zen/ipns_TAG_refresh.sh" (add crypto/contracts there) ######################################################################## ## COPY LOCALHOST IPFS URL TO CLIPBOARD -[[ $(which xclip) ]] && echo "http://127.0.0.1:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" | xclip -selection c +[[ $(which xclip) ]] && echo "http://127.0.0.1:8080/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" | xclip -selection c ######################################################################## ######################################################################## @@ -380,7 +380,7 @@ then ######################################################################## # CREATION DU FICHIER ${PREFIX}ASTRXBIAN FILE : Add 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 + && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8080" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN # ADD NEW LINE TO INDEX if [[ -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/ajouter_video.txt ]] @@ -436,9 +436,9 @@ fi ~/.zen/astrXbian/zen/ipns_self_publish.sh ######################################################################## echo "DUNIKEY PASS $PASS" -echo "NEW $TYPE ($file) ADDED. http://127.0.0.1:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" -echo "INDEX UPDATED : http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN" -echo "VIDEO IPNS LINK : http://127.0.0.1:8181/ipns/$KEY/$G1PUB/" +echo "NEW $TYPE ($file) ADDED. http://127.0.0.1:8080/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" +echo "INDEX UPDATED : http://127.0.0.1:8080/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN" +echo "VIDEO IPNS LINK : http://127.0.0.1:8080/ipns/$KEY/$G1PUB/" echo "#### EXCECUTION TIME" end=`date +%s` echo Execution time was `expr $end - $start` seconds. diff --git a/zen/new_mp3_in_astroport.sh b/zen/new_mp3_in_astroport.sh index bda9b9d..eaba28c 100755 --- a/zen/new_mp3_in_astroport.sh +++ b/zen/new_mp3_in_astroport.sh @@ -116,7 +116,7 @@ echo "${TITLE}" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1 echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.timestamp # IPNS index.html Redirect to ipfs streaming link (could be contract or anything else !!) -echo "" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/index.html +echo "" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/index.html IPNSLINK=$(ipfs key list -l | grep ${INDEXPREFIX}${REFERENCE} | cut -d ' ' -f 1) echo " @@ -149,6 +149,6 @@ echo "${TITLE}" > ~/.zen/PIN/${IPFSREPFILEID}/${IPNS}/.title rm -Rf ${YTEMP} echo "NEW ($file) ADDED." -echo "IPNS LINK : http://127.0.0.1:8181/ipns/$KEY/$G1PUB/" +echo "IPNS LINK : http://127.0.0.1:8080/ipns/$KEY/$G1PUB/" exit 0 diff --git a/zen/refresh_ASTRXBIAN_index.sh b/zen/refresh_ASTRXBIAN_index.sh index f34632f..6fa2497 100755 --- a/zen/refresh_ASTRXBIAN_index.sh +++ b/zen/refresh_ASTRXBIAN_index.sh @@ -15,7 +15,7 @@ export IPFSNODEID=$(ipfs id -f='\n') for PREFIX in F A S do cat ~/.zen/ipfs_swarm/.12D*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN - echo "${PREFIX} INDEX UPDATED : http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN" + echo "${PREFIX} INDEX UPDATED : http://127.0.0.1:8080/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN" done ######################################################################## diff --git a/zen/stream/process-stream.sh b/zen/stream/process-stream.sh index e71c60c..2b94208 100755 --- a/zen/stream/process-stream.sh +++ b/zen/stream/process-stream.sh @@ -2,7 +2,7 @@ HLS_TIME=40 M3U8_SIZE=3 -IPFS_GATEWAY="http://127.0.0.1:8181" +IPFS_GATEWAY="http://127.0.0.1:8080" echo "Astroport stream is playing on star_1 : https://tube.copylaradio.com/ipns/$(ipfs key list -l | grep star_1 | cut -d ' ' -f 1)" diff --git a/zen/tools/MEDIAKEY_dunikey_pass_QR.sh b/zen/tools/MEDIAKEY_dunikey_pass_QR.sh index 7ee1666..7ccd088 100755 --- a/zen/tools/MEDIAKEY_dunikey_pass_QR.sh +++ b/zen/tools/MEDIAKEY_dunikey_pass_QR.sh @@ -2,7 +2,7 @@ # ADD QR/sec CODE & DUNIKEY TO MEDIAKEY # Fabrique ou récupère un PASS pour fabriquer le QRCode "privé" sécurisé avec openssl # ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/QRsec.png -# http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/QRsec.png +# http://127.0.0.1:8080/ipns/${IPFSNODEID}/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/QRsec.png for MEDIAKEY in $(ipfs key list); do diff --git a/zen/tools/autoPINfriends.sh b/zen/tools/autoPINfriends.sh index 616fb6b..8479332 100755 --- a/zen/tools/autoPINfriends.sh +++ b/zen/tools/autoPINfriends.sh @@ -79,7 +79,7 @@ do ############################################ PINNING NODE MAKES ALL HIS FRIENDS MOVIES AVAILABLE TO ALL ## TODO : DECIDE TO ACTIVATE THIS BEHAVIOUR OR NOT ? ## Copy FASTRXBIAN index (makes movies available for ALL) - [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/FASTRXBIAN ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/FASTRXBIAN + [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/FASTRXBIAN ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8080" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/FASTRXBIAN if [[ "$keytype" == "TMDB" ]]; then cat ~/.zen/ipfs_swarm/.12D*/astroport/kodi/vstream/FASTRXBIAN | grep ";$mediaid;" | tail -n 1 >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/FASTRXBIAN cat ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/FASTRXBIAN | uniq > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/FASTRXBIAN