Promofaux
8c0f860601
Use systemctl/service calls instead of killall to restart/reload dnsmasq
8 years ago
Promofaux
090fbd04af
Remove ${SUDO} usages and root checks from scripts called by `pihole` command as they should not be called directly.
8 years ago
Promofaux
b3e7619048
curly brackets all the variables!
8 years ago
diginc
5fb6c5b012
Making the whitelist re-block echo consistent with other WL/BL echos
8 years ago
diginc
3affa73257
Only re-block whitelist deletions if in adlists
...
* Prevent blocking benign/untracked domains deleted off whitelist
* Issue #581
8 years ago
bcambl
27a9642090
check for sudo via 'command -v' instead of dkpg-query
8 years ago
Mcat12
3fda2d9ac3
Fix helpfunc not found error
8 years ago
Jim Liu
10066209e7
Update whitelist.sh
...
Change piholeIPfile to a permanent location.
9 years ago
Jim Liu
81fdfcba22
Update whitelist.sh
9 years ago
Mcat12
619082dbed
Merge branch 'development' into BugFix463
...
Conflicts:
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
9 years ago
Mayur Raiturkar
56ac04c48e
fixed helpFunc 2
9 years ago
Promofaux
ad574f5e90
Replace kill with killall
9 years ago
Promofaux
4941a657bf
remove -s switch, as it turns out it worked afterall.
9 years ago
Promofaux
3d4bff9414
Add -s switch to kill command to increase compatability
9 years ago
Adam Warner
77f4126f9b
add root check to whitelist script
9 years ago
Promofaux
48fa83c9ac
Fix whitespace
9 years ago
Promofaux
05e0003555
Fixes issue #453
9 years ago
Promofaux
107e0404de
Move `exit 1` outside of `if` block on verbose check to stop dnsmasq reloading
9 years ago
Promofaux
3154a378a6
Remove clear in DisplayWlist and force verbose to false to tidy up output.
9 years ago
Promofaux
6c87698f1a
fix spelling in name of variable ($versbose -> $verbose)
9 years ago
Justin Theberge
9a4c5cef86
fix indentations
9 years ago
Justin Theberge
bdfc86f850
fix formatting
9 years ago
Justin Theberge
70dadfba28
add list options requested from issue#442
9 years ago
Adam Warner
e074c72130
Move help output to function helpFunc, add -h argument.
9 years ago
Promofaux
47cc757ed0
Fix incorrect echo
9 years ago
Promofaux
0bbfb323b1
make whitelist honour pihole.conf file
9 years ago
nate
b80821c4b7
Merged branch development into PiHoleController
9 years ago
nate
cf01b5a002
Readded `cat` calls to fix permission issue
9 years ago
nate
fee55fa642
Added gravity.sh to the list of options
9 years ago
nate
76ea1962be
Controller script, pihole.sh added
...
Syntax changes for user output to be consistent
9 years ago
nate
f2150ee7e1
Merge conflict resolution
9 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
9 years ago
nate
a4fbccac9b
Merge conflict resolution
9 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
9 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