axiom-team
/
astroport
9
3
Fork 1
Code Issues 13 Pull Requests 1 Releases Wiki Activity

git merge trouble

This commit is contained in:
qo-op 2020-06-13 13:33:13 +02:00
parent 09ca7a8b77
commit dfe7d2df69
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cron_MINUTE.sh
View File

@ -63,28 +63,6 @@ echo $timebar
#
$MY_PATH/g1sms/sms_ASTROPORT.sh
<<<<<<< HEAD
####### OPEN PORT TO FORWARD ####### ADMIN ANY NODE (placer à 5 + 1mn)
### ADAPT TO ANY IPFSNODEID and TCP port
if [[ "$timebar" == "09:46" ]]; then
if [[ "$IPFSNODEID" == "QmVywXoBSz7JZ5vunYYVwi72SdTizvFt7k7qd3ooyYHvHA" ]]; then
echo '' > /tmp/A_p2pFwd_$IPFSNODEID
ipfs p2p close --all
ipfs p2p listen /x/g1pub-ssh /ip4/127.0.0.1/tcp/22 # CLOSE WITH ipfs p2p close /x/g1pub-ssh
echo "G1smsPub FORWARD: ipfs p2p forward /x/g1pub-ssh /ip4/127.0.0.1/tcp/2021 /p2p/QmVywXoBSz7JZ5vunYYVwi72SdTizvFt7k7qd3ooyYHvHA" >> /tmp/A_p2pFwd_$IPFSNODEID
ipfs p2p listen /x/g1pub-http /ip4/127.0.0.1/tcp/80
echo "G1smsPub FORWARD: ipfs p2p forward /x/g1pub-http /ip4/127.0.0.1/tcp/8021 /p2p/QmVywXoBSz7JZ5vunYYVwi72SdTizvFt7k7qd3ooyYHvHA" >> /tmp/A_p2pFwd_$IPFSNODEID
fi
# Start G1sms API push/pull
$MY_PATH/zen/ipfs_OPEN_ports.sh
fi
=======
>>>>>>> 75933498b2558f9459fa8345ab26da2eb693334d
#if [[ "$timebar" == "18:01" ]]; then
#[[ "$IPFSNODEID" == "QmVywXoBSz7JZ5vunYYVwi72SdTizvFt7k7qd3ooyYHvHA" ]] && ipfs p2p listen /x/g1pub-http /ip4/127.0.0.1/tcp/80
#echo "G1smsPub FORWARD: ipfs p2p forward /x/g1pub-http /ip4/127.0.0.1/tcp/8021 /p2p/QmVywXoBSz7JZ5vunYYVwi72SdTizvFt7k7qd3ooyYHvHA"
#fi
# TIME NTP SYNC: TODO: Problem being root (stickybit INSTALL?)
# G1Tx. G1sms. G1Dab Zen economy needs precise time sync (RpiZero !!)
# Tx rates is limited by Station time synchronisation.