Commit Graph

37 Commits

Author SHA1 Message Date
48fa83c9ac Fix whitespace 2016-04-10 21:36:33 +01:00
05e0003555 Fixes issue #453 2016-04-10 21:17:58 +01:00
107e0404de Move exit 1 outside of if block on verbose check to stop dnsmasq reloading 2016-04-08 23:01:13 +01:00
3154a378a6 Remove clear in DisplayWlist and force verbose to false to tidy up output. 2016-04-08 20:12:30 +01:00
6c87698f1a fix spelling in name of variable ($versbose -> $verbose) 2016-04-08 20:10:10 +01:00
9a4c5cef86 fix indentations 2016-04-08 10:14:17 -04:00
bdfc86f850 fix formatting 2016-04-07 21:58:57 -04:00
70dadfba28 add list options requested from issue#442 2016-04-07 21:52:47 -04:00
e074c72130 Move help output to function helpFunc, add -h argument. 2016-04-06 09:32:36 +01:00
47cc757ed0 Fix incorrect echo 2016-04-05 00:03:24 +01:00
0bbfb323b1 make whitelist honour pihole.conf file 2016-04-04 21:08:56 +01:00
b80821c4b7 Merged branch development into PiHoleController 2016-04-01 12:17:41 -05:00
cf01b5a002 Readded cat calls to fix permission issue 2016-04-01 12:17:05 -05:00
fee55fa642 Added gravity.sh to the list of options 2016-03-28 18:37:49 -05:00
76ea1962be Controller script, pihole.sh added
Syntax changes for user output to be consistent
2016-03-28 18:31:21 -05:00
f2150ee7e1 Merge conflict resolution 2016-03-28 13:07:51 -05:00
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
2016-03-28 12:58:44 -05:00
a4fbccac9b Merge conflict resolution 2016-03-28 12:53:21 -05:00
8ef4c12f97 Merge branch 'ScriptCleanup'
Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh
2016-03-28 12:21:18 -05:00
0b9e78df2c Cleaned code and added prompt for purge on uninstall 2016-03-26 16:57:01 -05:00
ced0ae0d65 remove trailing whitespace whitelist.sh 2016-03-05 21:15:53 -08:00
48f9a61ff0 Updated License 2016-01-30 15:12:40 -05:00
3cd1a5b1d5 ... Helps if I add the changes to the repo file, and not the test file on my pi. 2016-01-24 16:51:54 +00:00
dfcf9d133e Make output make a bit more sense 2016-01-24 16:46:00 +00:00
f9a2ca5c32 Tidy up help text on both scripts. Add quiet help. 2016-01-16 00:47:45 +00:00
5d842a7533 Merging 2016-01-15 18:45:12 +00:00
f68cf10efa Tidied up a couple of things 2016-01-15 15:54:00 +00:00
534dbc9b6e added a quiet option for when the script is called by gravity. Less output = less confusion! 2016-01-15 14:48:07 +00:00
8ad116fe7b Aiming to get whitelist.sh to run either standalone or to be called from gravity.sh. Initial commit 2016-01-15 14:17:55 +00:00
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...
2015-12-09 15:16:34 -06:00
cb91b8f5fa Add copyright headers 2015-12-06 05:55:50 -08:00
831322b8b2 replace file paths with variables 2015-11-27 18:38:33 -06:00
573c1ef94f double bracket notation 2015-11-27 18:34:02 -06:00
a2cddda590 if whitelist.txt doesn't exist, create it 2015-11-27 18:29:44 -06:00
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.
2015-10-25 16:53:20 -07:00
52ef76d717 missed a few more /etc/host changes 2015-07-30 18:10:26 +01:00
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...
2015-07-18 09:39:18 -05:00