diff --git a/.install/mpd_rompr.sh b/.install/mpd_rompr.sh index 92f1c87..614d07d 100755 --- a/.install/mpd_rompr.sh +++ b/.install/mpd_rompr.sh @@ -5,6 +5,9 @@ # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) ######################################################################## { +######################################################################## +############# TO VERIFY AND FINISH .... TODO ########################### +######################################################################## MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized ME="${0##*/}" @@ -93,9 +96,9 @@ echo '++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ install ' | lolcat -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 +sudo apt-get install nginx ssl-cert php-curl php-sqlite3 php-gd php-json php-xml php-mbstring php-fpm sqlite -y || err=1 -[[ ! $(which nslookup) ]] && sudo apt-get install lolcat dnsutils -y +[[ ! $(which nslookup) ]] && sudo apt-get install dnsutils -y echo '++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ __ ___ _ ___ @@ -127,14 +130,17 @@ Portal ' | lolcat ### -echo "INSTALL LOVELand WebSite. Linking to /var/www ..." -if [[ ! -L /var/www/jukebox ]]; then - sudo ln -s /home/$YOU/.zen/astrXbian/www/jukebox /var/www/jukebox -fi echo "JUKEBOX init" -mkdir -p /var/www/jukebox/albumart && sudo chmod -R 777 /var/www/jukebox/albumart -mkdir -p /var/www/jukebox/prefs && sudo chmod -R 777 /var/www/jukebox/prefs +sudo rm -f /var/www/jukebox +sudo cp -Rf /home/xbian/.zen/astrXbian/www/jukebox /var/www/jukebox +sudo mkdir -p /var/www/jukebox/albumart +sudo chmod 777 /var/www/jukebox/albumart +sudo mkdir -p /var/www/jukebox/prefs +sudo chmod 777 /var/www/jukebox/prefs +sudo chown -R xbian:xbian /var/www/jukebox +sudo cp -f /home/xbian/.zen/astrXbian/.install/templates/nginx/jukebox.conf /etc/nginx/conf.d/ + # CONFIG NGINX - LOVE LAND FRONTAL WEB PAGE echo "$NODENAME" | figlet -f slant | lolcat @@ -144,17 +150,8 @@ 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}') -### JUKEBOX RompR CopyLaRadio -if [[ $(which mpd) ]]; then - sudo sed "s/_PHPVERSION_/$PHPVERSION/g" /home/$YOU/.zen/astrXbian/www/loveland.conf > /tmp/jukebox.conf - sudo sed -i "s/_MY_NODE_NAME_/$NODENAME/g" /tmp/jukebox.conf - sudo sed -i "s/_PORT_/80/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 - ##### RESTART NGINX -sudo systemctl restart nginx || err=1 +sudo service nginx restart || err=1 if [[ $err ]]; then @@ -169,18 +166,4 @@ else fi -# Open in browser -URL="http://$NODENAME" -path=$(which xdg-open || which gnome-open) - -xo () -{ - for var in "$@"; do - $path "$var"; - sleep 0.5 - done -} - -[[ -n $path ]] && xo $URL:80 > /dev/null - } # for script being completely downloaded before run diff --git a/install.sh b/install.sh index 7710ffd..88690f5 100755 --- a/install.sh +++ b/install.sh @@ -45,20 +45,15 @@ cd /etc/rc6.d && sudo ln -s ../init.d/ipfs K01ipfs sudo ipfs restart sudo fail2ban restart -### Install jukebox & astrxbian & NGINX config -sudo rm -f /var/www/jukebox -sudo cp -Rf /home/xbian/.zen/astrXbian/www/jukebox /var/www/jukebox -sudo mkdir -p /var/www/jukebox/albumart -sudo chmod 777 /var/www/jukebox/albumart -sudo mkdir -p /var/www/jukebox/prefs -sudo chmod 777 /var/www/jukebox/prefs -sudo chown -R xbian:xbian /var/www/jukebox -sudo cp -f /home/xbian/.zen/astrXbian/.install/templates/nginx/jukebox.conf /etc/nginx/conf.d/ - +### Install astrxbian & NGINX config sudo rm -f /var/www/astrxbian sudo cp -Rf /home/xbian/.zen/astrXbian/www/xbian /var/www/astrxbian sudo cp -f /home/xbian/.zen/astrXbian/.install/templates/nginx/astrxbian.conf /etc/nginx/conf.d/ +# TODO ####################################################################### +# echo "Install JUKEBOOX" +# ~/.zen/astrXbian/.install/mpd_rompr.sh + sudo nginx restart echo "Installation complete !!"