diff --git a/images/LivingTV.gif b/images/LivingTV.gif new file mode 100644 index 00000000..8e5ffdf9 Binary files /dev/null and b/images/LivingTV.gif differ diff --git a/install.sh b/install.sh index b71334a9..5786b004 100755 --- a/install.sh +++ b/install.sh @@ -61,7 +61,7 @@ echo "#############################################" echo "######### PATIENCE ######" echo "#############################################" # removed : sqlite -for i in qrencode jq bc file gawk yt-dlp ffmpeg dnsutils ntpdate v4l-utils espeak vlc mp3info musl-dev openssl* detox nmap httrack html2text msmtp imagemagick; do +for i in qrencode jq bc file gawk yt-dlp ffmpeg dnsutils ntpdate v4l-utils espeak vlc mp3info musl-dev openssl* detox nmap httrack html2text ssmtp imagemagick; do if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then echo ">>> Installation $i <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" sudo apt install -y $i @@ -86,9 +86,9 @@ echo "#############################################" echo "## INSTALLATION AstroGEEK OpenCV = 'Intelligence Amie' - DEV - " # sudo apt-get install python3-opencv -y -## MAILJET RELAYING : ADD YOUR CREDENTIALS -cp ~/.zen/Astroport.ONE/templates/.msmtprc ~/ -chmod 600 ~/.msmtprc +## MAILJET SSMTP RELAYING : ADD YOUR CREDENTIALS +sudo cp ~/.zen/Astroport.ONE/templates/.ssmtprc /etc/ssmtp/ssmtp.conf +chmod 600 /etc/ssmtp/ssmtp.conf ## Correct PDF restrictions for imagemagick echo "# Correction des droits export PDF imagemagick" diff --git a/templates/.msmtprc b/templates/.msmtprc index 7ac573ef..7568591e 100644 --- a/templates/.msmtprc +++ b/templates/.msmtprc @@ -1,9 +1,9 @@ account default -host in-v3.mailjet.com +host mail.asycn.io port 587 -from support@qo-op.com -auth login -user fbcd95c1b3d08a67dad0988193ca0795 -password 367a3a753546134eeac030d5bf6e41f0 +from support@g1sms.fr +user support@g1sms.fr +password mercilaput1depasserellesmtp +tls_nocertcheck tls_starttls on -tls_certcheck off +tls on diff --git a/templates/.ssmtprc b/templates/.ssmtprc new file mode 100644 index 00000000..3f4c496e --- /dev/null +++ b/templates/.ssmtprc @@ -0,0 +1,8 @@ +root=support@g1sms.fr +mailhub=mail.asycn.io:587 +rewriteDomain=g1sms.fr +FromLineOverride=YES +AuthUser=support@g1sms.fr +AuthPass=mercilaput1depasserellesmtp +UseSTARTTLS=yes +UseTLS=yes diff --git a/templates/players.txt b/templates/players.txt new file mode 100644 index 00000000..427294b0 --- /dev/null +++ b/templates/players.txt @@ -0,0 +1,28 @@ +"^[As][Ss][Tt]" "AstcU2Wr3QHvRkXAtZS4neSLmmcv1cAaUpuCLBGwLgev" ".@#Mz0*m6vQ;vrTzO{))WB)m/g?-:Ov" "B/Ox:3UQA8=KZejAH+" +"^[As][Ss][Tt]" "AstQEd3bBBFpt8jA1ZhJbS1z1KczCoTC6EByJPyUbwAw" "k&gfvDvAx%3]5zu+s" "S{?N7b_KA*_S6pro" +"^[As][Ss][Tt]" "ASTgMRRhmL45NWbBNBGauFftzqF2w31oz9EdrCPQqnS5" "}Z*g[0z4@#08d.bdy_M%_jN81K8}/%7" "%+c+p*O1I}9Ix%.!" +"^[As][Ss][Tt]" "ASTHq1nMG9mRtKUygkLg3HpKJxH23BDhM4dDgcRJ5RXU" "Bl',5:U)1q2pS0sU_aV" "Koeg@6N2N@y^x&h]6..6y;K+XMa}Sr" +"^[As][Ss][Tt]" "ASTuF53WR3cXVWkco3Uypw9Yvybby1fcUiojYGFQ3Mqz" "b5(huW=1^(iq/!r&zNWtA3D!n4" "7DkhX[(X9^nrp{7chn1D')$,3^^#(" +"^[As][Ss][Tt]" "ASTdFHcsfj2KTd14RMDFPvTc8Ap3zqicPuDxHLtiCKH9" "q?IV;eA;jSyo'(alp" "0+T}9v'4%0W]]ngM" +"^[As][Ss][Tt]" "AStfZgSaXbDJwsFxoZEahSWxYMfT5pwB6dmuYGyEeAD3" "D6-A({NAJ}2_7fAx" "78V[5kZ-_4tqdIQj#q/yKgA%rak_}" +"^[As][Ss][Tt]" "AstZWG8go6oGMxo8cZgwZ5mF6BwzKNkSXXNxyHHTaZzH" "n]c'VWeyQgD-c$eA&hVJ[x#" "0-y+Zxn3&0U^g-6A&=0mc6Sm" +"^[As][Ss][Tt]" "ASTqTRxyrkyjBoGCjvX9magD8MYjnUNFqo8abnJRAnJ4" "_J.i7AN6tgKIUnvn?Exss" "k7Hg#2#BkB*7l+H,E" +"^[As][Ss][Tt]" "AStkK1X4xTypZKLq95YZVoBjw7HTjQe7YW7ESNZ9ifqG" "vZ5)z_J!s,,.x75}30/kXo]Jkc,%" "dAXiI$+dcg&S)nW?kqOEWy0rd2i7IE" +"^[As][Ss][Tt]" "AsT6562xCUcpZvDJ2qrpqrt8yuKLTHb4XnhBYSzRqNTN" "}TsD=keOS3u^(l==ZETtIrSrJwa" "iNSN[lx:dshgjux+g.3fdScUOA/" +"^[As][Ss][Tt]" "AstrgTXS5sShBqAXbKYyW5SReiHddeTVwjzQsGvtNKmK" "}b$p7'aXN:0n4Ee?/!@@1lf{8Tc:(h^" "b.'$$/0y]*8#3sK?$7r%d'Skn_r" +"^[As][Ss][Tt]" "AsTyHRETf2zu4NKrTfmg84qXEWq16C6zAmm2sdTYhAyS" "[1?6Xxrs.O8SNwO-" "{1bn(lg:4y%g/hhm?7s:" +"^[As][Ss][Tt]" "ASTmi3XzDmCD4QWzSSsxvW2cwCoLbGUwTaCcWagJ1rq7" ";Ezz3EbVond/.VIj1.fx" "{Q*mxe50DKotj}4y,2,;1mD" +"^[As][Ss][Tt]" "AstcUQf6K8cEThKiKzQU7gD2A3QWFKkTZKqf9FwTcout" "Ag_zhf+2$*I+btWwg=enTAuZfM,$MM" "mDBfD.$HdD5/akxjeZtiT']H*cnppV" +"^[As][Ss][Tt]" "ASTJVbTDmrN1upU2VYaMNCm4DmEZHnSErMHRGdowt56M" "?U'U8yp4^T.ZE(zb;" "^573m?,V037E*Id3nkgf0x+" +"^[As][Ss][Tt]" "AStwgaUp2uvzLFmP7sMPNagBiffDTaVATvnBjT3WCeSk" "6*MtwsbZ4z+Ashr$Z92$H[VBp{" "/0c*#[$%)*J({jZyb" +"^[As][Ss][Tt]" "AStXdVGKuqYUxBt5jYZhC3pxAUVwESyFZ6C1V5CUXjG2" "K_J/If;h+u+unz%;1W'}!,6.3H" "I6}z'5qb{alS(ghD" +"^[As][Ss][Tt]" "AstxR2ZpZtcf5fwzeM5SFqVDbJ2ySDScRKxWm2gGwnNm" "e^&h7s9S=vOr:8-t9zs1" "U3jm=y['n#XTUaXp4%vOZshg,^i](" +"^[As][Ss][Tt]" "AStSbQ3PgHgRoouGUsUXhG9h7cJ6sg9iPwE5UK82JV5n" "$%mniB058!zS'yD8]D&15pwdr,Ed/vV" "?xaKs5_[%01Vi&7m5b00]H94" +"^[As][Ss][Tt]" "ASThs7NiAztpCnYZEnZgT6KdmFUhLqp6Uw8qnvp6MMDS" "*Hpi0JZ&;f{d^gt{ZA,7j&q3[Z*AT8e" "X.6y=6k0aM0]D[;^}U=M4M," +"^[As][Ss][Tt]" "AsTcK8yfAsGZSJLxnJUH83Chtk4bBxsVzaKR18cmc98C" "[tvc4#?Wel.V%OO^eg?8hE9p]kZT@#" "b$W$&]ahx416sE((?w" +"^[As][Ss][Tt]" "AstdYmguZJnkgfrDMM9MoJiFvX3wTNo9wSL2LauRZXon" "O8];'!'54:9v^wke*k-lp5" "7zaEa{*;fwe{09q@ecj}9EWq351Bcy[" +"^[As][Ss][Tt]" "ASTb4AtwBY74itiEtU32bgdBESirxT8pDLieTRqw8mnP" "k+9IX2)dJ0w^&.Jfsdtzmr3[j(i:!4^" "O/sbv/x4:I)qt@aj@o" +"^[As][Ss][Tt]" "AstWwR3EdFTsY7645eVCK7QzLjc4F9rxEDmGDiN3rB6W" "po.40T:,Z7?3c,-XS3U-OVSw'_" "AEycn1=j0!8Jeisi63?,/A$jMiBk-=f" +"^[As][Ss][Tt]" "ASTHC2w1D9Hav6gNgkbp3bRRVwz4BnLo2h4kZZVTAD2q" "Ss'Qsfw4&t-S(x}))NO" "0y7JTAQmppe+7+t0E?e:MJ=hd" +"^[As][Ss][Tr][Oo]" "ASTo9BmR5eYsfEzZrWasHyk1diawEWjxcBnS5WEfmpxm" "Uo5EDW7VM%+DZ-84K7!s.pZx:" "ys;-M^}1.0_cr/8&ocdnar97oKaoh-[" +"^[As][Ss][Tr][Oo]" "AsToSJbDEGJg5yF8MtDW1Frq4AqPDJ4Mwn6GkcYNFcXn" "6X*d74w0D0lXwe4avN.]v[@," "e'Kj=n]*)wm=NDa'vf" diff --git a/tools/mailjet.sh b/tools/mailjet.sh index e4cb53be..590e496e 100755 --- a/tools/mailjet.sh +++ b/tools/mailjet.sh @@ -13,65 +13,19 @@ echo ' # qo-op ############# '$MY_PATH/$ME' ######################################################################## -# SEND EMAIL $1=SUBJECT $2=TXT $3=HTML $4=DEST +# SEND EMAIL FORGE IT YOUR WAY ########################################################################' ### PLEASE CHANGE YOUR DOMAIN AND KEY ( OR HELP PAYING TRAFIC ;) ## THIS IS A FREE LIMITED ACCOUNT. DO NOT EXAGERATE ;) -MJ_APIKEY_PUBLIC='fbcd95c1b3d08a67dad0988193ca0795' -MJ_APIKEY_PRIVATE='367a3a753546134eeac030d5bf6e41f0' - -SENDER_EMAIL='support@qo-op.com' - -RECIPIENT_EMAIL="$4" -[[ ! $RECIPIENT_EMAIL ]] && RECIPIENT_EMAIL='support@qo-op.com' - - - -## NOT WORKING !!! HOW TO MAKE THE RIGHT JSON : TODO -echo '{"Messages":[ - { - "From": { - "Email": "'$SENDER_EMAIL'", - "Name": "qo-op" - }, - "To": [ - { - "Email": "'$RECIPIENT_EMAIL'", - "Name": "Astroport" - } - ], - "Subject": "'$1'", - "TextPart": "'$2'", - "HTMLPart": "'$3'" - } - ] - }' - -echo "THIS SCRIPT NEED DEBUGGING" -exit 1 - -# Run: -curl -s -X POST \ - --user "$MJ_APIKEY_PUBLIC:$MJ_APIKEY_PRIVATE" \ - https://api.mailjet.com/v3.1/send \ - -H 'Content-Type: application/json' \ - -d '{"Messages":[ - { - "From": { - "Email": "'$SENDER_EMAIL'", - "Name": "qo-op" - }, - "To": [ - { - "Email": "'$RECIPIENT_EMAIL'", - "Name": "Astroport" - } - ], - "Subject": "'$1'", - "TextPart": "'$2'", - "HTMLPart": "'$3'" - } - ] - }' | jq -r +mail=support@qo-op.com +echo " +From: fred@g1sms.fr +To: EMAIL +Subject: SUBJECT +MESSAGE +" > ~/.zen/tmp/email.txt +SUBJECT="[(♥‿‿♥)] message personnel. merci. " +MESSAGE="( ◕‿◕) Bonjour $PLAYER\n\nTW http://qwantic.com:1234 .\n\nAstroport" +cat ~/.zen/tmp/email.txt | sed "s~EMAIL~${mail}~g" | sed "s~SUBJECT~${SUBJECT}~g" | sed "s~MESSAGE~${MESSAGE}~g" | ssmtp -v ${mail}