26 Commits (4f0835978686a462fb6e154dac6b437ec4f8a616)

Author	SHA1	Message	Date
nate	b80821c4b7	Merged branch development into PiHoleController	8 years ago
nate	cf01b5a002	Readded `cat` calls to fix permission issue	8 years ago
nate	fee55fa642	Added gravity.sh to the list of options	8 years ago
nate	76ea1962be	Controller script, pihole.sh added ... Syntax changes for user output to be consistent	8 years ago
nate	f2150ee7e1	Merge conflict resolution	8 years ago
nate	2311b42bca	Merge branch 'ScriptCleanup-Dev' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/piholeDebug.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	8 years ago
nate	a4fbccac9b	Merge conflict resolution	8 years ago
nate	8ef4c12f97	Merge branch 'ScriptCleanup' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	8 years ago
nate	0b9e78df2c	Cleaned code and added prompt for purge on uninstall	9 years ago
Carter Maxwell	ced0ae0d65	remove trailing whitespace whitelist.sh	9 years ago
Mcat12	48f9a61ff0	Updated License	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
Promofaux	f9a2ca5c32	Tidy up help text on both scripts. Add quiet help.	9 years ago
Adam Warner	5d842a7533	Merging	9 years ago
Adam Warner	f68cf10efa	Tidied up a couple of things	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
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
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