Dan Schaper
494fcd60ab
Merge branch 'development' of https://github.com/jacobsalmela/pi-hole into development
9 years ago
Mcat12
544919175c
Added back in debugging response header
9 years ago
Mcat12
ede8f4714f
Removed extra http redirect
9 years ago
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
5d608a2db5
leave system cron alone
...
Taking JoshKastang’s idea from #153 , the system cron file will be left
alone and the pihole.cron gets its own.
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
jacobsalmela
ca5e34a9a9
Merge branch 'master' into whitelist
...
# Conflicts:
# gravity.sh
9 years ago
Jacob Salmela
4b1dd8a2a5
fixes #158
...
Running at midnight, not 11:58 in the afternoon.
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
d215fa9ade
Resolve merge confict
9 years ago
Dan Schaper
cb91b8f5fa
Add copyright headers
9 years ago
Jacob Salmela
f453d407a9
log-async
...
For better performance. I have been using it for a few weeks with no
adverse effects.
9 years ago
Jacob Salmela
49a40115c8
fixes #105
9 years ago
Dan Schaper
2193d6a81f
Document dnsmasq.conf config
9 years ago
Jacob Salmela
c34cc1608b
for use with logstalgia
...
This seems to show the domain queried and the path requested.
9 years ago
Jacob Salmela
1eb7f879f0
fixes #101
...
the line url.access-deny caused the error.
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
ce0ca3cc61
for use with /etc/crontab
...
Adding a system-wide crontab to update the ad source lists, flush the
log daily, and (eventually) record the stats for historical purposes.
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
Jacob Salmela
271163ed66
Merge pull request #61 from nathanpjones/improve-whitelist-script
...
Improve whitelisting script
9 years ago
Jacob Salmela
2f9e650739
Merge pull request #62 from jacobsalmela/lighttpd
...
New lighttpd.conf. Closes #31 and #50
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
Jacob Salmela
17904b3106
ads still get blocked when a 404 happens
9 years ago
Jacob Salmela
7b16a42f31
conditionals for accessing the web interface
...
This adds in some back end improvements for better debugging. It also
allows you to access the Web interface, while you are connected to the
Pi-hole, which resolves #31
9 years ago
Jacob Salmela
28dd956449
changing web server root folder
...
Since the version of lighted in Jessie moved the default folder to
/var/www/html, I am going to make it the same for wheezy for better
compatibility.
Also removed spaces
9 years ago
Jacob Salmela
bf397db73e
adding crontab file
...
I plan to use this to be deployed with the automatic installer. Just
pushing the file for now so I can test download it.
9 years ago
jacobsalmela
d68c262b96
swap file to eliminate memory allocation error
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
Jacob Salmela
2d96f005e6
Merge pull request #28 from Fourdee/patch-2
...
Adjusting chronomiter.sh to use the new /var/log/pihole.log
9 years ago
Dan
9627b27f15
pihole logfile changes
...
https://github.com/jacobsalmela/pi-hole/pull/27
9 years ago
Dan
9230be63d5
.log extension
9 years ago
Dan
e20f948e49
Log PiHole dns stats to /var/log/pihole
...
Log PiHole dns stats to /var/log/pihole
Removes the requirement for rsyslog and reading the shared logfile /var/log/daemon.log
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
rmceoin
b7e2c8053b
Add local-ttl to dnsmasq config so that queries are cached by the requesting device.
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
jacobsalmela
e8b33ec8ee
Automated installer test
9 years ago
jacobsalmela
294cf6d595
Removing since not using IPv6 right now
9 years ago
jacobsalmela
9d5a7531ca
Testing script for a mini LCD
...
This script is for use with an Adafruit LCD so that you can peek at the
domains as they are blocked in real time. It's not necessary for the
Pi-hole to function, but something fun I am working on. There will be
a video in the next article I post.
9 years ago
jacobsalmela
e6b17ae8e9
Removing IPv6 support for now
...
I'm not fully up on my IPv6, and using the loopback doesn't work for
clients anyway as described in the latest commit to gravity.sh
9 years ago
jacobsalmela
7290f7f950
Multiple gif files to choose from
...
25Bytes is the smallest, but can sometimes display weird on different
browser/systems. Pick the one that works the best for you.
9 years ago
jacobsalmela
68ff6b02f9
listening on IPv6, too
...
Removed server=127.0.0.1 because it listens there by default
9 years ago
jacobsalmela
857c1e6edf
new index to display tiny gif
...
The GIF is only 25 Bytes.
Thanks to http://probablyprogramming.com/2009/03/15/the-tiniest-gif-ever
9 years ago
jacobsalmela
1637e9fe58
Enabling IPv6 on the Pi itself
9 years ago
jacobsalmela
1ef3ab5af8
very similar lighttpd conf
9 years ago
jacobsalmela
7ed49b07cf
Enabling IPv6
9 years ago
jacobsalmela
56c776af22
hosts format script
9 years ago
jacobsalmela
ebeb25d4ae
initial commit
10 years ago
jacobsalmela
925e8630ca
initial commit
10 years ago
jacobsalmela
60cc27a978
file for automated install
10 years ago
jacobsalmela
72209cbac0
file for automated install
10 years ago