Promofaux
9ab6df0e54
Merge branch 'development' into promoTweaksTheSecond
...
# Conflicts:
# advanced/Scripts/blacklist.sh
# advanced/Scripts/whitelist.sh
2016-10-20 21:06:28 +01:00
Marcus Hildum
0efda04920
Use heredocs instead of multiple calls to echo
...
There were a lot of places (like in help functions) that used multiple
echo calls instead of heredocs. Personal opinion but this seems cleaner.
2016-10-19 20:46:37 -07:00
Marcus Hildum
28eeaf201b
Standardize function declaration
...
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical
myfucn() {
}
style.
2016-10-19 19:47:45 -07:00
Promofaux
a64f4cd871
whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument
2016-10-19 23:17:20 +01:00
Promofaux
8c0f860601
Use systemctl/service calls instead of killall to restart/reload dnsmasq
2016-10-16 17:16:59 +01:00
Promofaux
090fbd04af
Remove ${SUDO} usages and root checks from scripts called by pihole command as they should not be called directly.
2016-10-15 17:54:04 +01:00
Promofaux
b3e7619048
curly brackets all the variables!
2016-08-21 02:12:02 +01:00
diginc
5fb6c5b012
Making the whitelist re-block echo consistent with other WL/BL echos
2016-07-20 12:53:31 -05:00
diginc
3affa73257
Only re-block whitelist deletions if in adlists
...
* Prevent blocking benign/untracked domains deleted off whitelist
* Issue #581
2016-07-20 12:43:30 -05:00
bcambl
27a9642090
check for sudo via 'command -v' instead of dkpg-query
2016-06-11 15:58:49 -06:00
Mcat12
3fda2d9ac3
Fix helpfunc not found error
2016-05-25 17:07:12 -04:00
Jim Liu
10066209e7
Update whitelist.sh
...
Change piholeIPfile to a permanent location.
2016-04-22 01:41:11 +08:00
Jim Liu
81fdfcba22
Update whitelist.sh
2016-04-21 23:40:38 +08:00
Mcat12
619082dbed
Merge branch 'development' into BugFix463
...
Conflicts:
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
2016-04-20 15:54:58 -04:00
Mayur Raiturkar
56ac04c48e
fixed helpFunc 2
2016-04-17 18:22:06 +05:30
Promofaux
ad574f5e90
Replace kill with killall
2016-04-16 15:52:38 +01:00
Promofaux
4941a657bf
remove -s switch, as it turns out it worked afterall.
2016-04-16 12:59:40 +01:00
Promofaux
3d4bff9414
Add -s switch to kill command to increase compatability
2016-04-16 10:56:49 +01:00
Adam Warner
77f4126f9b
add root check to whitelist script
2016-04-13 15:51:48 +01:00
Promofaux
48fa83c9ac
Fix whitespace
2016-04-10 21:36:33 +01:00
Promofaux
05e0003555
Fixes issue #453
2016-04-10 21:17:58 +01:00
Promofaux
107e0404de
Move exit 1 outside of if block on verbose check to stop dnsmasq reloading
2016-04-08 23:01:13 +01:00
Promofaux
3154a378a6
Remove clear in DisplayWlist and force verbose to false to tidy up output.
2016-04-08 20:12:30 +01:00
Promofaux
6c87698f1a
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:10 +01:00
Justin Theberge
9a4c5cef86
fix indentations
2016-04-08 10:14:17 -04:00
Justin Theberge
bdfc86f850
fix formatting
2016-04-07 21:58:57 -04:00
Justin Theberge
70dadfba28
add list options requested from issue#442
2016-04-07 21:52:47 -04:00
Adam Warner
e074c72130
Move help output to function helpFunc, add -h argument.
2016-04-06 09:32:36 +01:00
Promofaux
47cc757ed0
Fix incorrect echo
2016-04-05 00:03:24 +01:00
Promofaux
0bbfb323b1
make whitelist honour pihole.conf file
2016-04-04 21:08:56 +01:00
nate
b80821c4b7
Merged branch development into PiHoleController
2016-04-01 12:17:41 -05:00
nate
cf01b5a002
Readded cat calls to fix permission issue
2016-04-01 12:17:05 -05:00
nate
fee55fa642
Added gravity.sh to the list of options
2016-03-28 18:37:49 -05:00
nate
76ea1962be
Controller script, pihole.sh added
...
Syntax changes for user output to be consistent
2016-03-28 18:31:21 -05:00
nate
f2150ee7e1
Merge conflict resolution
2016-03-28 13:07:51 -05:00
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
2016-03-28 12:58:44 -05:00
nate
a4fbccac9b
Merge conflict resolution
2016-03-28 12:53:21 -05:00
nate
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
nate
0b9e78df2c
Cleaned code and added prompt for purge on uninstall
2016-03-26 16:57:01 -05:00
Carter Maxwell
ced0ae0d65
remove trailing whitespace whitelist.sh
2016-03-05 21:15:53 -08:00
Mcat12
48f9a61ff0
Updated License
2016-01-30 15:12:40 -05:00
Promofaux
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
Promofaux
dfcf9d133e
Make output make a bit more sense
2016-01-24 16:46:00 +00:00
Promofaux
f9a2ca5c32
Tidy up help text on both scripts. Add quiet help.
2016-01-16 00:47:45 +00:00
Adam Warner
5d842a7533
Merging
2016-01-15 18:45:12 +00:00
Adam Warner
f68cf10efa
Tidied up a couple of things
2016-01-15 15:54:00 +00:00
Adam Warner
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
Adam Warner
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
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...
2015-12-09 15:16:34 -06:00
Dan Schaper
cb91b8f5fa
Add copyright headers
2015-12-06 05:55:50 -08:00
