Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1464 from pi-hole/new/tricorder_option

Browse source 
Tricorder debug logs are now uploaded using SSL when `openssl` is available
This commit is contained in:
WaLLy3K 2017-05-14 15:37:25 +10:00 committed by GitHub
commit 703ff09a91
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pihole
View file

@ -268,6 +268,14 @@ piholeCheckoutFunc() {
checkout "$@" checkout "$@"
} }
tricorderFunc() {
if command -v openssl &> /dev/null; then
openssl s_client -quiet -connect tricorder.pi-hole.net:9998 2> /dev/null < /dev/stdin
else
nc tricorder.pi-hole.net 9999 < /dev/stdin
fi
}
helpFunc() { helpFunc() {
cat << EOM cat << EOM
::: Control all Pi-hole specific functions ::: Control all Pi-hole specific functions
@ -302,6 +310,7 @@ helpFunc() {
::: 'pihole disable 5m' - will disable blocking for 5 minutes ::: 'pihole disable 5m' - will disable blocking for 5 minutes
::: restartdns Restart dnsmasq ::: restartdns Restart dnsmasq
::: checkout Check out different branches ::: checkout Check out different branches
::: tricorder Upload log to Pi-hole's medical tricorder (uses SSL when possible)
EOM EOM
exit 0 exit 0
} }
@ -333,5 +342,6 @@ case "${1}" in
"-a" | "admin" ) webpageFunc "$@";; "-a" | "admin" ) webpageFunc "$@";;
"-t" | "tail" ) tailFunc;; "-t" | "tail" ) tailFunc;;
"checkout" ) piholeCheckoutFunc "$@";; "checkout" ) piholeCheckoutFunc "$@";;
"tricorder" ) tricorderFunc;;
* ) helpFunc;; * ) helpFunc;;
esac esac