diff --git a/.install/loveland.sh b/.install/loveland.sh index 4af5756..28ace1c 100755 --- a/.install/loveland.sh +++ b/.install/loveland.sh @@ -1,7 +1,13 @@ #!/bin/bash +######################################################################## +# Author: Fred (support@qo-op.com) +# Version: 2020.03.24 +# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) +######################################################################## { MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized +ME="${0##*/}" [[ $USER == "root" ]] && echo "DO NOT RUN AS root!! Use regular USER with sudo AUTHORISATION" && exit 1 @@ -17,45 +23,47 @@ if [[ ! $(which youtube-dl) ]]; then sudo chown $USER /usr/local/bin/youtube-dl fi -sudo apt install libid3-tools mpd mpc lame -y || err=1 +# AUDIO LAYER +sudo apt-get update +sudo apt-get install libid3-tools mpd mpc lame -y || err=1 sudo apt-get install lame sox libsox-fmt-mp3 eyed3 python-chardet imagemagick curl -y #libav-tools || err=1 sudo apt-get install ca-certificates git-core binutils rsync alsa-utils bc espeak mpg321 fuse atomicparsley -y || err=1 ## CONFIG MPD sudo cp -f $MY_PATH/templates/copylaradio/mpd.conf /etc/mpd.conf 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 && chown $USER ~/.config/mpd/mpd.conf -mkdir ~/.config/mpd -sudo cp -f /etc/mpd.conf ~/.config/mpd/mpd.conf -chown $USER ~/.config/mpd/mpd.conf - +## MUSIC & PLAYLISTS mkdir -p ~/.zen/music mkdir -p ~/.zen/playlists +## 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?) -### NGINX +### INSTALL NGINX sudo apt-get install fail2ban nginx ssl-cert openssl-blacklist php-curl php-sqlite3 php-gd php-json php-xml php-mbstring php-fpm sqlite -y || err=1 -# CONFIG NGINX - LOVE LAND +# CONFIG NGINX - LOVE LAND FRONTAL WEB PAGE sudo cp -f $MY_PATH/../www/loveland.conf /etc/nginx/conf.d/ 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 nodename=$(cat /etc/hostname) extension=$(echo $nodename | cut -d '.' -f 2) if [[ $extension == $nodename ]]; then - nodename=$nodename.local + nodename=$nodename.local # TODO : Adpapt to Internet BOX local DNS stategy fi sudo sed -i "s/_SERVERNAME_/$nodename/g" /etc/nginx/conf.d/loveland.conf -sudo systemctl restart nginx || err=1 - # INSTALL LOVELand WebSite LINKs sudo ln -s $MY_PATH/../www/LOVELand/ /var/www/loveland sudo chmod 777 /var/www/loveland/jukebox/albumart sudo chmod 777 /var/www/loveland/jukebox/prefs +sudo systemctl restart nginx || err=1 + if [[ $err ]]; then echo -e "${c_red}Installation de LOVELand incomplète$c_" exit 1 @@ -64,4 +72,4 @@ else exit 0 fi -} +} # for script being completely downloaded before run diff --git a/g1sms/init.sh b/g1sms/init.sh index de96f04..3606b34 100755 --- a/g1sms/init.sh +++ b/g1sms/init.sh @@ -54,6 +54,7 @@ g1sms $G1SMS export YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1); +# TODO (make and use ./zen/config ) ################################################################## # Activate logging to /tmp/g1sms.log (YES/NO) export DOLOG="YES" diff --git a/g1sms/sms_ASTROPORT.sh b/g1sms/sms_ASTROPORT.sh index 940f1b7..70a1045 100755 --- a/g1sms/sms_ASTROPORT.sh +++ b/g1sms/sms_ASTROPORT.sh @@ -10,17 +10,33 @@ MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized source $MY_PATH/init.sh source $MY_PATH/functions.sh + TODAY=$(date '+%Y%m%d') +timestamp=$(date -u +%s%N | cut -b1-13) log "__SUB:sms_ASTROPORT.sh" -# VERIFY /tmp/loveland_entrance EXISTS and is 777 +# VERIFY task relay directory EXISTS and is 777 +# LOCAL MODE [[ ! -d /tmp/loveland_entrance ]] && mkdir -p /tmp/loveland_entrance && chmod -R 777 /tmp/loveland_entrance +# SWARM MODE +[[ ! -d /home/$YOU/.zen/ipfs_swarm/.$ipfsnodeid/TASK/loveland_entrance ]] \ +&& mkdir -p /home/$YOU/.zen/ipfs_swarm/.$ipfsnodeid/TASK/loveland_entrance \ +&& chmod -R 777 /home/$YOU/.zen/ipfs_swarm/.$ipfsnodeid/TASK/loveland_entrance + +# SWARM MODE +# for hashfile in $(ls /home/$YOU/.zen/ipfs_swarm/.Qm*/TASK/loveland_entrance); do +# TODO SSB task relay MODE +# Search new SSB Publish for hashfile in $(ls /tmp/loveland_entrance/); do PHONE=$(cat $hashfile) PHONEHASH=$(basename -- "$hashfile") - # CHECK PHONE + + # TODO CHECK PHONE IN SWARM +# if [[ ! -f /home/$YOU/.zen/ipfs_swarm/.Qm*/CHANNEL/$PHONEHASH@*/_pub ]]; then +# fi + if [[ ! -f /home/$YOU/.zen/g1sms_wallets/$PHONE/_pub ]]; then # NOT THERE sms_INIT_ACCOUNT "$PHONE" @@ -31,14 +47,20 @@ for hashfile in $(ls /tmp/loveland_entrance/); do AMOUNTG1=$(silkaj_balance $PUBKEY) AMOUNTDU=$(bc -l <<< "scale=2; $AMOUNTG1 / $DUFACTOR") AMOUNTLOVE=$(bc -l <<< "scale=0; $AMOUNTG1 * 100 / $DUFACTOR") + + # DOUBLE AUTH SMS !! - mess="Bonjounr -Ce numéro est déjà enregistré... + mess="Bonjour +Compte Astroport Station" # Send response SMS sms_SEND "$PHONE" "$mess" + # SEND THE KEY !! + + + fi done diff --git a/www/LOVELand/ajax.php b/www/LOVELand/ajax.php index ee4c1b4..b99f385 100644 --- a/www/LOVELand/ajax.php +++ b/www/LOVELand/ajax.php @@ -7,7 +7,7 @@ if (isset($_REQUEST['email'])) $email = $_REQUEST['email']; else $email = ""; $message = "Message de {$phone} / {$email}"; -$headers = "From: webmaster@zicmama.com"; // Who should it come from? +$headers = "From: support@qo-op.com"; // Who should it come from? if( $phone != "" || $email != "" ) { error_log("SEND EMail ". $email. " ". $phone ); mail($to, $subject, $message, $headers); diff --git a/www/LOVELand/index.html b/www/LOVELand/index.html index 682014f..012a4f2 100644 --- a/www/LOVELand/index.html +++ b/www/LOVELand/index.html @@ -54,7 +54,7 @@