From 9b93d95cc617c19e5eabb1f60a7f47d265e313d3 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Sat, 12 Dec 2020 02:34:49 +0100
Subject: [PATCH] ipfs gateway 8181 port to AVOID CONFLICT WITH KODI REMOTE

---
 .../addons/plugin.video.vstream/resources/sites/astroport.py  | 2 +-
 .install/ipfs_alone.sh                                        | 4 +++-
 ISOconfig.sh                                                  | 2 +-
 zen/ssb_INIT.sh                                               | 4 ++--
 zen/ssb_SURVEY_contact.sh                                     | 2 +-
 zen/xbian_vstream.sh                                          | 2 +-
 6 files changed, 9 insertions(+), 7 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 b22b518..c9ffc00 100644
--- a/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py
+++ b/.install/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py
@@ -16,7 +16,7 @@ SITE_IDENTIFIER = 'astroport'
 SITE_NAME = 'ASTROPORT _PROFIL_ (_LOGIN_) (_MDP_)'
 SITE_DESC = 'Partage ~/astroport/films (animes, series) avec ses amis https://cesium.app via IPFS'
 
-URL_MAIN = 'http://localhost:8080/ipns/_IPNSKEY_/xbian/'
+URL_MAIN = 'http://localhost:8181/ipns/_IPNSKEY_/xbian/'
 
 KEY_PASTE_ID = 'PASTE_ID'
 SETTING_PASTE_ID = 'pastebin_id_'
diff --git a/.install/ipfs_alone.sh b/.install/ipfs_alone.sh
index 7096d08..2e8516a 100755
--- a/.install/ipfs_alone.sh
+++ b/.install/ipfs_alone.sh
@@ -125,8 +125,10 @@ ipfs bootstrap add /ip6/fe80::208:a2ff:fe0c:20d8/tcp/4001/p2p/12D3KooWBYme2BsNUr
 ###########################################
 # TODO: ADD some other bootstrap NODES
 ###########################################
+# AVOID CONFLICT WITH KODI REMOTE
+ipfs config Addresses.Gateway "/ip4/127.0.0.1/tcp/8181"
 
-sudo systemctl start ipfs || err "Start IPFS daemon"
+sudo service ipfs start || err "Start IPFS daemon"
 
 sleep 3
 
diff --git a/ISOconfig.sh b/ISOconfig.sh
index 7a4bf06..1b1cc5f 100755
--- a/ISOconfig.sh
+++ b/ISOconfig.sh
@@ -104,7 +104,7 @@ rm -Rf ~/.zen/ipfs
 mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/G1SSB
 ########################################################################
 # Give $XZUID to your (gchange friends) to add in Vstream Astroport and access your sharings
-# IPNS link to "pastebin list" http://localhost:8080/ipns/$IPNSKEY/xbian/$XZUID
+# IPNS link to "pastebin list" http://localhost:8181/ipns/$IPNSKEY/xbian/$XZUID
 ########################################################################
 XZUID=$(~/.zen/astrXbian/zen/tools/diceware.sh 1 | xargs)-$(~/.zen/astrXbian/zen/tools/diceware.sh 1 | xargs)$(hostname -I | cut -d ' ' -f 1 | cut -d "." -f 4 )
 echo "CREATE ~/.zen/ipfs/xbian/$XZUID"
diff --git a/zen/ssb_INIT.sh b/zen/ssb_INIT.sh
index 37f91fa..c033e95 100755
--- a/zen/ssb_INIT.sh
+++ b/zen/ssb_INIT.sh
@@ -172,9 +172,9 @@ fi
 DUFACTOR=$(bc <<< "scale=2; $(cat /home/$YOU/.zen/_DU) / 100")
 AMOUNTLOVE=$(bc -l <<< "scale=0; $myJune * 100 / $DUFACTOR")
 # OLD ssb-server publish
-# sbot publish --type about --about $WHOAMI --description "[Astroport Node](https://astroport.com) [$IPFSNODEID](http://localhost:8080/ipns/$IPFSNODEID) - Wallet $G1PUB - $diskperf" --name "$title" --image "$id"
+# sbot publish --type about --about $WHOAMI --description "[Astroport Node](https://astroport.com) [$IPFSNODEID](http://localhost:8181/ipns/$IPFSNODEID) - Wallet $G1PUB - $diskperf" --name "$title" --image "$id"
 # NEW sbotc publish to oasis
-sbotc publish "{\"type\":\"about\",\"about\":\"$WHOAMI\",\"description\":\"![QRCode]($qrid)\\n[Station Astroport](https://astroport.com)\\n - [Mon Marché](https://gchange.fr/#/app/wot/$G1PUB) \\n - [Mon portefeuille ($AMOUNTLOVE :heart:)](https://cesium.app/) \\n Station ID : [$IPFSNODEID](http://localhost:8080/ipns/$IPFSNODEID) \\n Disque: $sizeAvail = $diskperf \\n - [Portail](http://$nodename:10010/) \\n\",\"name\":\"$title\",\"image\":\"$id\"}"
+sbotc publish "{\"type\":\"about\",\"about\":\"$WHOAMI\",\"description\":\"![QRCode]($qrid)\\n[Station Astroport](https://astroport.com)\\n - [Mon Marché](https://gchange.fr/#/app/wot/$G1PUB) \\n - [Mon portefeuille ($AMOUNTLOVE :heart:)](https://cesium.app/) \\n Station ID : [$IPFSNODEID](http://localhost:8181/ipns/$IPFSNODEID) \\n Disque: $sizeAvail = $diskperf \\n - [Portail](http://$nodename:10010/) \\n\",\"name\":\"$title\",\"image\":\"$id\"}"
 
 
 # SSB PUBLISH G1 wallet silkaj balance 
diff --git a/zen/ssb_SURVEY_contact.sh b/zen/ssb_SURVEY_contact.sh
index 3d6eaf6..8fbea45 100755
--- a/zen/ssb_SURVEY_contact.sh
+++ b/zen/ssb_SURVEY_contact.sh
@@ -98,7 +98,7 @@ $author
 ~/.zen/ipfs/.${ipfsnodeid}/CONTACT/${g1author}/ipfs_swarm.key.crypt
 
 PUBLISH IPFS
-http://localhost:8080/ipns/
+http://localhost:8181/ipns/
 "
         ipfs name publish --quieter /ipfs/$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
 
diff --git a/zen/xbian_vstream.sh b/zen/xbian_vstream.sh
index 1a5fbd6..0362247 100755
--- a/zen/xbian_vstream.sh
+++ b/zen/xbian_vstream.sh
@@ -36,7 +36,7 @@ do
 	filename=$(basename -- "$file")
 	extension="${filename##*.}"
 	filena="${filename%.*}"
-	echo "$filena;http://localhost:8080/ipfs/$AFSHARE/$filename" >> ~/.zen/ipfs/xbian/F${XZUID}
+	echo "$filena;http://localhost:8181/ipfs/$AFSHARE/$filename" >> ~/.zen/ipfs/xbian/F${XZUID}
 done
 
 ### TODO