From 9b6111cec19b7a615d4179824ec3bb4f77904f8f Mon Sep 17 00:00:00 2001 From: qo-op Date: Sun, 17 May 2020 23:44:45 +0200 Subject: [PATCH] loveland coming... --- .install/loveland.sh | 52 ++++++++++++++++++++++++++++++++++---------- cron_MINUTE.sh | 7 +++--- 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/.install/loveland.sh b/.install/loveland.sh index d17f424..0589b18 100755 --- a/.install/loveland.sh +++ b/.install/loveland.sh @@ -32,7 +32,7 @@ echo ' \____/\____/ .___/\__, /_____/\__,_/_/ |_|\__,_/\__,_/_/\____/ /_/ /____/ -Multimedia Layer installation +Multimedia Layer installation https://copylaradio.com ' ######## YOUTUBE-DL ########## if [[ ! $(which youtube-dl) ]]; then @@ -52,16 +52,15 @@ sudo cp -f /home/$YOU/.zen/astroport/.install/templates/copylaradio/mpd.conf /et sudo sed -i "s/_USER_/$USER/g" /etc/mpd.conf || err=1 mkdir ~/.config/mpd && sudo cp -f /etc/mpd.conf ~/.config/mpd/mpd.conf && sudo chown $USER ~/.config/mpd/mpd.conf +## MULTIMEDIA ## VIDEO & AUDIO & PLAYLISTS ~/.zen/ DIR mkdir -p ~/.zen/video mkdir -p ~/.zen/audio mkdir -p ~/.zen/playlists -## CHOWN mpd FILES STRUCTURE ( -echo "TODO: CHECK if mpd start after a reboot !!" +## CHOWN mpd FILES STRUCTURE sudo chown -R $USER /var/lib/mpd/ /var/run/mpd /run/mpd /var/log/mpd sudo service mpd restart || err=1 -## TODO add to system start (/etc/rc.local?) ### INSTALL NGINX echo ' @@ -75,7 +74,7 @@ echo ' ' sudo apt-get install fail2ban nginx ssl-cert php-curl php-sqlite3 php-gd php-json php-xml php-mbstring php-fpm sqlite -y || err=1 -# KILL RUNNING OASIS +# IN CASE, KILL RUNNING OASIS 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" [[ ! $(which nslookup) ]] && sudo apt-get install lolcat dnsutils -y @@ -90,7 +89,7 @@ echo ' ' | lolcat myip=$(hostname -I | awk '{print $1}') -# Check if IP is from reserved LAN addresses +# Check if IP is from reserved LAN addresses (Thanks a lot to https://stackoverflow.com) isLAN=$(echo $myip | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") # Find 1st route gateway myRouter=$(sudo route -n | head -n 3 | tail -n 1 | awk '{print $2}') @@ -102,7 +101,6 @@ echo $nodename if [[ ! $isLAN ]]; then oasis --allow-host $nodename 2>&1>/dev/null & echo "BE CAREFULL your SSB identity could be publicly controled..." - echo "TODO correct 'Not Found' error (cors problem related)" else oasis --allow-host $nodename --host $nodename 2>&1>/dev/null & fi @@ -111,20 +109,50 @@ sleep 5 # CONFIG NGINX - LOVE LAND FRONTAL WEB PAGE sudo cp -f /home/$YOU/.zen/astroport/www/loveland.conf /etc/nginx/conf.d/ +## TODO optimise loveland.conf +### Each Extra Flavour take a new +sudo cp /etc/nginx/conf.d/loveland.conf /etc/nginx/conf.d/10010.conf +sudo cp /etc/nginx/conf.d/loveland.conf /etc/nginx/conf.d/10020.conf +sudo cp /etc/nginx/conf.d/loveland.conf /etc/nginx/conf.d/10030.conf +sudo cp /etc/nginx/conf.d/loveland.conf /etc/nginx/conf.d/10030.conf -PHPVERSION=$(ps auxf | grep php-fpm | grep -v -E 'color=auto|grep' | head -n 1 | grep -oP '(?<=\().*(?=\))' | awk -F '/' '{print $4}') -sudo sed -i "s/_PHPVERSION_/$PHPVERSION/g" /etc/nginx/conf.d/loveland.conf -sudo sed -i "s/_SERVERNAME_/$nodename/g" /etc/nginx/conf.d/loveland.conf -sudo sed -i "s/_PORT_/10010/g" /etc/nginx/conf.d/loveland.conf -sudo sed -i "s/_APPLI_//g" /etc/nginx/conf.d/loveland.conf echo "INSTALL LOVELand WebSite" if [[ ! -L /var/www/loveland ]]; then sudo ln -s /home/$YOU/.zen/astroport/www/LOVELand /var/www/loveland fi + +# RompR JUKEBOX sudo chmod -R 777 /var/www/loveland/jukebox/albumart sudo chmod -R 777 /var/www/loveland/jukebox/prefs +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 /etc/nginx/conf.d/loveland.conf +sudo sed -i "s/_SERVERNAME_/$nodename/g" /etc/nginx/conf.d/loveland.conf +sudo sed -i "s/_PORT_/10010/g" /etc/nginx/conf.d/loveland.conf +sudo sed -i "s/_APPLI_//g" /etc/nginx/conf.d/loveland.conf + +### GCHANGE G1 Zen +sudo sed "s/_PHPVERSION_/$PHPVERSION/g" /home/$YOU/.zen/astroport/www/loveland.conf /etc/nginx/conf.d/gchange.conf +sudo sed -i "s/_SERVERNAME_/$nodename/g" /etc/nginx/conf.d/gchange.conf +sudo sed -i "s/_PORT_/10020/g" /etc/nginx/conf.d/gchange.conf +sudo sed -i "s/_APPLI_/gchange/g" /etc/nginx/conf.d/gchange.conf + +### CESIUM G1 Zen +sudo sed "s/_PHPVERSION_/$PHPVERSION/g" /home/$YOU/.zen/astroport/www/loveland.conf /etc/nginx/conf.d/cesium.conf +sudo sed -i "s/_SERVERNAME_/$nodename/g" /etc/nginx/conf.d/cesium.conf +sudo sed -i "s/_PORT_/10030/g" /etc/nginx/conf.d/cesium.conf +sudo sed -i "s/_APPLI_/cesium/g" /etc/nginx/conf.d/cesium.conf + +### SSB OASIS Zen +sudo sed "s/_SERVERNAME_/$nodename/g" /home/$YOU/.zen/astroport/www/oasis.conf /etc/nginx/conf.d/oasis.conf +sudo sed -i "s/_PORT_/10040/g" /etc/nginx/conf.d/oasis.conf +sudo sed -i "s/_LPORT_/3000/g" /etc/nginx/conf.d/oasis.conf +sudo sed -i "s/_APPLI_//g" /etc/nginx/conf.d/oasis.conf + + + # Disabling default website # sudo rm -f /etc/nginx/sites-enabled/default diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index 9738650..7555f87 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -26,13 +26,14 @@ export isG1smsRunning=$(ps auxf --sort=+utime | grep -w gammu | grep -v -E 'colo && echo "ipfs daemon not running. EXIT" \ && exit 1 -export YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1); -export IPFSNODEID=$(ipfs id -f='\n') - # CORRECT PATH [[ ! $(echo $PATH | grep "/usr/local/bin") ]] && export PATH="$PATH:/usr/local/bin" [[ ! $(echo $PATH | grep "~/.local/bin") ]] && export PATH="$PATH:~/.local/bin" +export YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1); +export IPFSNODEID=$(ipfs id -f='\n') + + ipfsnodeid=$(ipfs id -f='\n') g1pub=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)