From d5d5edda0d6d9c8d3ba7227e25fd37c81ef2b2db Mon Sep 17 00:00:00 2001 From: qo-op Date: Sat, 23 May 2020 00:06:53 +0200 Subject: [PATCH] rewriting chapters --- .install/loveland.sh | 14 ++++++++------ www/g1billet.conf | 6 ++++-- www/loveland.conf | 2 +- www/oasis.conf | 4 ++-- zen/tools/make_G1SSB_secret.sh | 4 +++- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.install/loveland.sh b/.install/loveland.sh index be50d93..d94b450 100755 --- a/.install/loveland.sh +++ b/.install/loveland.sh @@ -24,6 +24,8 @@ IPFSNODEID=$(ipfs id -f='\n') ################################## ## INSTALL +[[ ! $(which figlet) ]] && sudo apt install figlet -y +[[ ! $(which lolcat) ]] && sudo apt install lolcat -y echo ' __ ____ _ __________ __ / / / __ \ | / / ____/ / ____ _____ ____/ / @@ -107,7 +109,7 @@ nodename=$(curl -s https://git.p2p.legal/axiom-team/astroport/raw/master/zen/too echo $nodename if [[ ! $isLAN ]]; then - ### TODO install Feddless.social + ### 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..." else @@ -138,7 +140,7 @@ 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 sudo sed "s/_PHPVERSION_/$PHPVERSION/g" /home/$YOU/.zen/astroport/www/loveland.conf > /tmp/loveland.conf -sudo sed -i "s/_NODERNAME_/$NODENAME/g" /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 sudo sed -i "s/_APPLI_//g" /tmp/loveland.conf sudo cp -f /tmp/loveland.conf /etc/nginx/conf.d/loveland.conf @@ -146,20 +148,20 @@ sudo cp -f /tmp/loveland.conf /etc/nginx/conf.d/loveland.conf ### GCHANGE G1 Zen sudo rm -f /etc/nginx/conf.d/gchange.conf sudo sed "s/_PHPVERSION_/$PHPVERSION/g" /home/$YOU/.zen/astroport/www/loveland.conf > /tmp/gchange.conf -sudo sed -i "s/_NODERNAME_/$NODENAME/g" /tmp/gchange.conf +sudo sed -i "s/_MY_NODE_NAME_/$NODENAME/g" /tmp/gchange.conf sudo sed -i "s/_PORT_/10020/g" /tmp/gchange.conf sudo sed -i "s/_APPLI_/gchange/g" /tmp/gchange.conf sudo cp -f /tmp/gchange.conf /etc/nginx/conf.d/gchange.conf ### CESIUM G1 Zen sudo sed "s/_PHPVERSION_/$PHPVERSION/g" /home/$YOU/.zen/astroport/www/loveland.conf > /tmp/cesium.conf -sudo sed -i "s/_NODERNAME_/$NODENAME/g" /tmp/cesium.conf +sudo sed -i "s/_MY_NODE_NAME_/$NODENAME/g" /tmp/cesium.conf 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/_NODERNAME_/$NODENAME/g" /home/$YOU/.zen/astroport/www/oasis.conf > /tmp/oasis.conf +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/_LPORT_/3000/g" /tmp/oasis.conf sudo sed -i "s/_APPLI_//g" /tmp/oasis.conf @@ -167,7 +169,7 @@ 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/_NODERNAME_/$NODENAME/g" /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 diff --git a/www/g1billet.conf b/www/g1billet.conf index d64eb9c..ea1a92e 100644 --- a/www/g1billet.conf +++ b/www/g1billet.conf @@ -1,6 +1,8 @@ server { - listen 9980; - server_name rock64.p2p.legal g1sms.local localhost 127.0.0.1; + listen _PORT_; + listen [::]:_PORT_; + + server_name _MY_NODE_NAME_ localhost 127.0.0.1; index index.php index.html; root /var/www/g1billet; diff --git a/www/loveland.conf b/www/loveland.conf index b5c0a64..9413039 100644 --- a/www/loveland.conf +++ b/www/loveland.conf @@ -5,7 +5,7 @@ server { root /var/www/loveland/_APPLI_; - server_name _NODERNAME_; + server_name _MY_NODE_NAME_; # This section can be copied into an existing default setup location / { diff --git a/www/oasis.conf b/www/oasis.conf index 7181747..7cd4c9f 100644 --- a/www/oasis.conf +++ b/www/oasis.conf @@ -5,10 +5,10 @@ server { root /var/www/loveland/_APPLI_; - server_name _NODERNAME_; + server_name _MY_NODE_NAME_; location / { - proxy_pass http://_NODERNAME_:_LPORT_; + proxy_pass http://_MY_NODE_NAME_:_LPORT_; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $remote_addr; } diff --git a/zen/tools/make_G1SSB_secret.sh b/zen/tools/make_G1SSB_secret.sh index 4f9b75a..713952c 100755 --- a/zen/tools/make_G1SSB_secret.sh +++ b/zen/tools/make_G1SSB_secret.sh @@ -50,7 +50,9 @@ fi [[ ! -d ~/.zen/astroport ]] && mkdir -p ~/.zen/astroport # IS git THERE ? -[[ ! $(which git) || ! $(which lolcat) ]] && sudo apt install git lolcat -y +[[ ! $(which git) ]] && sudo apt install git lolcat figlet -y +[[ ! $(which figlet) ]] && sudo apt install figlet -y +[[ ! $(which lolcat) ]] && sudo apt install lolcat -y # USE git pull OR git clone if [[ -f ~/.zen/astroport/install.sh ]]; then