From ac88b5f6426b301512367b30dea1764de0f7b544 Mon Sep 17 00:00:00 2001 From: qo-op Date: Sat, 23 May 2020 17:31:32 +0200 Subject: [PATCH] ipfs p2p PROPAGATION WITH 'zen/ipfs_OPEN_ports.sh' --- .install/loveland.sh | 68 ++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/.install/loveland.sh b/.install/loveland.sh index aa5bc37..9047f6f 100755 --- a/.install/loveland.sh +++ b/.install/loveland.sh @@ -87,7 +87,7 @@ sudo apt-get install fail2ban nginx ssl-cert php-curl php-sqlite3 php-gd php-jso # IN CASE, KILL RUNNING OASIS sudo kill -9 $(ps auxf --sort=+utime | grep -w oasis | grep -v -E 'color=auto|grep' | tail -n 1 | awk '{print $2}') -echo "REstarting OASIS with good $nodename & network config" +echo "REstarting OASIS with good NODENAME & network config" [[ ! $(which nslookup) ]] && sudo apt-get install lolcat dnsutils -y echo ' @@ -105,15 +105,15 @@ isLAN=$(echo $myip | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|( # Find 1st route gateway myRouter=$(sudo route -n | head -n 3 | tail -n 1 | awk '{print $2}') # Ask to the router its name (BOX DNS or system defined) -nodename=$(curl -s https://git.p2p.legal/axiom-team/astroport/raw/master/zen/tools/nodename | bash) -echo $nodename +NODENAME=$(curl -s https://git.p2p.legal/axiom-team/astroport/raw/master/zen/tools/nodename | bash) +echo $NODENAME if [[ ! $isLAN ]]; then ### TODO install Feddless.social ??? - oasis --allow-host $nodename --host $nodename --public 2>&1>/dev/null & - echo "BE CAREFULL your SSB identity could be publicly controled..." + oasis --allow-host $NODENAME --host $NODENAME --public 2>&1>/dev/null & + echo "--public OASIS STATION CANNOT HTTP PUBLISH..." else - oasis --allow-host $nodename --host $nodename 2>&1>/dev/null & + oasis --allow-host $NODENAME --host $NODENAME 2>&1>/dev/null & fi sleep 5 @@ -129,16 +129,15 @@ sudo chmod -R 777 /var/www/loveland/jukebox/prefs # CONFIG NGINX - LOVE LAND FRONTAL WEB PAGE -echo "$nodename" | figlet -f slant | lolcat -NODENAME=$nodename +echo "$NODENAME" | figlet -f slant | lolcat YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1); -## Write nodename to IPFS -echo "$nodename" > /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_nodename +## Write NODENAME to IPFS +echo "$NODENAME" > /home/$YOU/.zen/ipfs/.$IPFSNODEID/G1SSB/_nodename PHPVERSION=$(ps auxf | grep php-fpm | grep -v -E 'color=auto|grep' | head -n 1 | grep -oP '(?<=\().*(?=\))' | awk -F '/' '{print $4}') -### ASTROPORT STATION PORTAL +### ASTROPORT STATION LOVELAND PORTAL sudo sed "s/_PHPVERSION_/$PHPVERSION/g" /home/$YOU/.zen/astroport/www/loveland.conf > /tmp/loveland.conf sudo sed -i "s/_MY_NODE_NAME_/$NODENAME/g" /tmp/loveland.conf sudo sed -i "s/_PORT_/10010/g" /tmp/loveland.conf @@ -160,25 +159,34 @@ sudo sed -i "s/_PORT_/10030/g" /tmp/cesium.conf sudo sed -i "s/_APPLI_/cesium/g" /tmp/cesium.conf sudo cp -f /tmp/cesium.conf /etc/nginx/conf.d/cesium.conf -### SSB OASIS Zen -sudo sed "s/_MY_NODE_NAME_/$NODENAME/g" /home/$YOU/.zen/astroport/www/oasis.conf > /tmp/oasis.conf -sudo sed -i "s/_PORT_/10040/g" /tmp/oasis.conf -sudo sed -i "s/_LHOST_/$NODENAME\:3000/g" /tmp/oasis.conf -sudo sed -i "s/_APPLI_//g" /tmp/oasis.conf -sudo cp -f /tmp/oasis.conf /etc/nginx/conf.d/oasis.conf - ### JUKEBOX RompR CopyLaRadio -sudo sed "s/_PHPVERSION_/$PHPVERSION/g" /home/$YOU/.zen/astroport/www/loveland.conf > /tmp/jukebox.conf -sudo sed -i "s/_MY_NODE_NAME_/$NODENAME/g" /tmp/jukebox.conf -sudo sed -i "s/_PORT_/10011/g" /tmp/jukebox.conf -sudo sed -i "s/_APPLI_/jukebox/g" /tmp/jukebox.conf -sudo cp -f /tmp/jukebox.conf /etc/nginx/conf.d/jukebox.conf +if [[ $(which mpd) ]]; then + sudo sed "s/_PHPVERSION_/$PHPVERSION/g" /home/$YOU/.zen/astroport/www/loveland.conf > /tmp/jukebox.conf + sudo sed -i "s/_MY_NODE_NAME_/$NODENAME/g" /tmp/jukebox.conf + sudo sed -i "s/_PORT_/10011/g" /tmp/jukebox.conf + sudo sed -i "s/_APPLI_/jukebox/g" /tmp/jukebox.conf + sudo cp -f /tmp/jukebox.conf /etc/nginx/conf.d/jukebox.conf +fi -### G1SMS loveland entrance localhost:10099 ("ipfs p2p" forwarded) +### SSB OASIS Zen (PROXY MODE 10040 -> 3000) +if [[ $(which oasis) ]]; then + sudo sed "s/_MY_NODE_NAME_/$NODENAME/g" /home/$YOU/.zen/astroport/www/oasis.conf > /tmp/oasis.conf + sudo sed -i "s/_PORT_/10040/g" /tmp/oasis.conf + sudo sed -i "s/_LHOST_/$NODENAME\:3000/g" /tmp/oasis.conf + sudo sed -i "s/_APPLI_//g" /tmp/oasis.conf + sudo cp -f /tmp/oasis.conf /etc/nginx/conf.d/oasis.conf +fi + +### G1SMS propagation to localhost:10099 / 10097 ("ipfs p2p" forwarded) if [[ $(which gammu) ]]; then - sudo sed "s/_PHPVERSION_/$PHPVERSION/g" /home/$YOU/.zen/astroport/www/g1sms.conf > /tmp/g1sms.conf - sudo cp -f /tmp/g1sms.conf /etc/nginx/conf.d/ # && ipfs p2p listen /x/g1sms /ip4/127.0.0.1/tcp/10099 # SEE 'zen/ipfs_OPEN_ports.sh' +# DIRECT MODE + sudo sed "s/_PHPVERSION_/$PHPVERSION/g" /home/$YOU/.zen/astroport/www/loveland.conf > /tmp/g1sms.conf + sudo sed -i "s/_MY_NODE_NAME_/$NODENAME/g" /tmp/g1sms.conf + sudo sed -i "s/_PORT_/10099/g" /tmp/g1sms.conf + sudo sed -i "s/_APPLI_/g1sms/g" /tmp/g1sms.conf + sudo cp -f /tmp/g1sms.conf /etc/nginx/conf.d/g1sms.conf else +# PROXY MODE (10099 -> 10097) ### ipfs p2p PROPAGATION WITH 'zen/ipfs_OPEN_ports.sh' sudo sed "s/_MY_NODE_NAME_/$NODENAME/g" /home/$YOU/.zen/astroport/www/oasis.conf > /tmp/g1sms_proxy.conf sudo sed -i "s/_PORT_/10099/g" /tmp/g1sms_proxy.conf sudo sed -i "s/_LHOST_/127\.0\.0\.1\:10097/g" /tmp/g1sms_proxy.conf @@ -190,15 +198,19 @@ sudo systemctl restart nginx || err=1 if [[ $err ]]; then + echo -e "${c_red}Installation de LOVELand bizarre??$c_" echo "PLEASE... POST YOUR ISSUE! https://git.p2p.legal/axiom-team/astroport/issues" + exit 1 else + echo -e "${c_green}LOVE Land a été installé avec succès$c_" - echo "LoveLand Portal link http://$nodename:10010 (TRY ME) + echo "LoveLand Portal link http://$NODENAME:10010 (TRY ME) -Add ScuttleButt Astroport PUB Invitation in http://$nodename:3000/settings +Add ScuttleButt Astroport PUB Invitation in http://$NODENAME:3000/settings oasis.astroport.com:8008::@UeiA9iqZ0/XTjmYBht230KGr44bsr+Tl5BXSUDFv8vo=.ed25519~jd9Z4y/d/xZCF7bfuSgQSiSGLMeWFhwMosKUFhFxeEY=" + exit 0 fi