Promofaux
af982a02af
Move call to CheckIPv6 function into CalcBlockedDomains, rather than relying on remembering to call it before you call CalcBlockedDomains.
9 years ago
Jacob Salmela
9ba38e668a
Merge pull request #193 from PromoFaux/Chronometer
...
Major overhaul of chronometer script
9 years ago
Adam Warner
f665899116
Update chronometer.sh
...
weirdness
9 years ago
Adam Warner
de464e17cc
Update chronometer.sh
...
Note to self, Find&Replace>Replace All is a bad idea.
9 years ago
Adam Warner
0eed56380d
Update chronometer.sh
...
What, me? Reference the wrong file?
9 years ago
Promofaux
487c26db44
Major overhaul. Added -j option to output stats as JSON formatted string. If run with no option, then chronometer runs as normal. Fixed calculations to match those on the web dashboard.
9 years ago
Jacob Salmela
d77399727c
Merge pull request #189 from jacobsalmela/whitelist
...
Switched CRLF to LF (DOS to UNIX)
9 years ago
Promofaux
414ef54cfe
Switched CRLF to LF (DOS to UNIX)
9 years ago
jacobsalmela
bd5ed2bcf0
move webinterface.sh into scripts folder
...
I also renamed it to make it is easier to identify.
9 years ago
Promofaux
f9a2ca5c32
Tidy up help text on both scripts. Add quiet help.
9 years ago
Adam Warner
2b0bee085b
Incorrect reference to whitelist in the blacklist.sh comments :)
9 years ago
Adam Warner
5d842a7533
Merging
9 years ago
Adam Warner
f68cf10efa
Tidied up a couple of things
9 years ago
Adam Warner
89e3c25a90
Behaves like whitelist, but on the blacklist
9 years ago
Adam Warner
14ee4850af
Placeholder for blacklist script
9 years ago
Adam Warner
534dbc9b6e
added a quiet option for when the script is called by gravity. Less output = less confusion!
9 years ago
Adam Warner
8ad116fe7b
Aiming to get whitelist.sh to run either standalone or to be called from gravity.sh. Initial commit
9 years ago
Jacob Salmela
57282cfe16
ugly hack to whitelist from the Web interface
...
I wanted the whitelist feature to keep the user on the same page
without having to reload it. I'm sure someone better versed in PHP
could eliminate the need for this hack. Nonetheless, it works.
www-data runs the script if executed from the Web interface. www-data
also needs access to write to /etc/pihole/gravity.list to actually
remove the domain. So a few more things need to happen before this
will fully work.
The changes in this script won't change what is displayed if run from
the terminal, but will help when it needs to be run from the Web
interface, so I am just committing this now.
The only other thing I would like to see would be a progress spinner,
but my Web skills still need some work...
9 years ago
Dan Schaper
cb91b8f5fa
Add copyright headers
9 years ago
Jacob Salmela
831322b8b2
replace file paths with variables
9 years ago
Jacob Salmela
573c1ef94f
double bracket notation
9 years ago
Jacob Salmela
a2cddda590
if whitelist.txt doesn't exist, create it
9 years ago
Jacob Salmela
a675dc3f2c
Merge pull request #68 from dschaper/hawson-reduce-memory
...
Hawson reduce memory
9 years ago
Jacob Salmela
1b51b9ade3
for use as a cron job
...
The log will be flushed daily and stats will be stored in a DB for
displaying on the Web interface.
9 years ago
Nathan Jones
deb48c124f
Improve whitelisting script
...
Match domain exactly instead of partially.
Gather list of domains to minimize number of times that hosts file must be enumerated.
Only add domain to whitelist if it isn't already present.
9 years ago
Fourdee
52ef76d717
missed a few more /etc/host changes
9 years ago
Dan
024395b73b
Update chronometer.sh
...
Missed a change todaysAdsEliminated to /\/etc\/pihole\/gravity.list/
9 years ago
Fourdee
9d99a4ef36
Patch 3 - Dont use /etc/hosts
...
/etc/pihole/gravity.list now stores the block list. Ensures the
/etc/hosts file is left untouched.
9 years ago
Dan
9627b27f15
pihole logfile changes
...
https://github.com/jacobsalmela/pi-hole/pull/27
9 years ago
jacobsalmela
11614263b8
better version of LCD display stats
9 years ago
jacobsalmela
9a2862de62
closes #24 whitelist without running gravity.sh
...
It's pretty slow because /etc/hosts is so large, but it works. You can
add any number of domains as arguments and it will search for and
remove each one.
Maybe someone smarter knows how to make it faster...
9 years ago
jacobsalmela
fd2b24f2a0
preparing files for merge and for testing automated install
...
I haven't merged anything before, so hopefully, I won't mess it up too
bad!
9 years ago