77 Commits (ff5ed561cc3ed2cb748f734a535e63c333188416)

Author	SHA1	Message	Date
Chad Howell	ff5ed561cc	Rename dnsmasq.conf to 01-pihole.conf ... Rename dnsmasq.conf to 01-pihole.conf to prepare for move to /etc/dnsmasq.d/ per the normal way of modding configs on Debian based systems.	9 years ago
Promofaux	754beed3a1	Bring up to date with master	9 years ago
Promofaux	8ecf8eb76c	output to match other scripts	9 years ago
Promofaux	3cd1a5b1d5	... Helps if I add the changes to the repo file, and not the test file on my pi.	9 years ago
Promofaux	dfcf9d133e	Make output make a bit more sense	9 years ago
Dan Schaper	1e735c26c4	Repo Change QuickFix ... QuickFix for Repo location change.	9 years ago
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