Confirm Tricorder is online

* Scan port 9998 to confirm the availability of "tricorder.pi-hole.net"
* Exit codes for upload process
This commit is contained in:
WaLLy3K 2017-05-18 12:43:17 +10:00 committed by GitHub
parent 075f00cecd
commit 1f3db8b602

7
pihole
View file

@ -305,9 +305,15 @@ tricorderFunc() {
echo "Please do not call Tricorder directly." echo "Please do not call Tricorder directly."
exit 1 exit 1
fi fi
if ! timeout 2 nc -z tricorder.pi-hole.net 9998 &> /dev/null; then
echo "Unable to connect to Pi-hole's Tricorder server."
exit 1
fi
if command -v openssl &> /dev/null; then if command -v openssl &> /dev/null; then
openssl s_client -quiet -connect tricorder.pi-hole.net:9998 2> /dev/null < /dev/stdin openssl s_client -quiet -connect tricorder.pi-hole.net:9998 2> /dev/null < /dev/stdin
exit "$?"
else else
echo "Your debug log will be transmitted unencrypted via plain-text" echo "Your debug log will be transmitted unencrypted via plain-text"
echo "There is a possibility that this could be intercepted by a third party" echo "There is a possibility that this could be intercepted by a third party"
@ -320,6 +326,7 @@ tricorderFunc() {
done done
echo " " echo " "
nc tricorder.pi-hole.net 9999 < /dev/stdin nc tricorder.pi-hole.net 9999 < /dev/stdin
exit "$?"
fi fi
} }