Promofaux
9e4e1d1cb2
improve comments
2016-10-27 11:09:24 +01:00
Promofaux
60142cd960
remove reference to whitelist.sh (no longer exists) replace with pihole -w
2016-10-27 11:06:11 +01:00
Promofaux
4c853defb2
add if traps to check for existence of whitelist.txt / blacklist.txt
2016-10-25 22:27:35 +01:00
Promofaux
d0826b2c33
Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
2016-10-23 19:33:28 +01:00
Marcus Hildum
ebbe1fc236
More consistency
...
Odd mix of variables quoted with and without no-op parameter expansion
(i.e. ${thing})
More ${thing} than not, make that the standard
2016-10-21 23:11:17 -07:00
Marcus Hildum
aac8e45397
Imbue gravity.sh with some consistency
...
Mish-mash of tabs and spaces used for indentation. Mostly tabs though,
so going with those. Also indenting blocks and enforcing the
loop statement; do
done
style over the newline for do since it seemed to be more common.
2016-10-21 23:02:45 -07:00
Adam Warner
8f9ff930b3
Merge pull request #823 from tuplink/EnableOrDisable
...
Enable or disable
2016-10-21 11:02:10 +01:00
Promofaux
9ab6df0e54
Merge branch 'development' into promoTweaksTheSecond
...
# Conflicts:
# advanced/Scripts/blacklist.sh
# advanced/Scripts/whitelist.sh
2016-10-20 21:06:28 +01:00
Tommy Huff
15d68467a1
attempt to fix
2016-10-20 10:12:02 -04:00
Tommy Huff
3b6ecc573e
fix conflict
...
Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable
2016-10-20 10:09:23 -04:00
Tommy Huff
3ca3eaa62c
change restartdnsmasq to restartdns
2016-10-20 09:40:45 -04:00
Tommy Huff
dda448e050
use finction in pihole to restart dnsmasq
2016-10-20 09:15:03 -04:00
Tommy Huff
60873144ea
make last line of script return a new line been bugging me for awhile
2016-10-20 09:09:35 -04:00
Tommy Huff
a9d17c96be
include status at end of gravity so if it is disabled you will see it when running
2016-10-20 09:03:20 -04:00
Tommy Huff
7d7e17b351
add toggle to enable or disable pi-hole
2016-10-20 08:45:20 -04:00
Adam Warner
c71a976e76
kill off an old ugly hack
2016-10-20 13:37:07 +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
9aa38cf0ae
mv patternbuffer instead of cp, then no need to clean up
2016-10-19 23:57:43 +01:00
Promofaux
a7fa7466fb
remove no longer needed code
2016-10-19 23:54:43 +01:00
Promofaux
3f73c61cee
cache event horizon before white/blacklists are applied for quicker processing on white/blacklist calls of gravity
2016-10-19 23:52:54 +01:00
Promofaux
b88fe572fe
Whitelist/Blacklist domains directly in the Event Horizon.
2016-10-19 23:15:05 +01:00
Promofaux
59ba6f8aec
add flag to skip download of lists
2016-10-19 22:06:19 +01:00
Promofaux
25343da6b7
wrong variable name
2016-10-19 20:03:29 +01:00
Promofaux
60d17b97f5
spacing
2016-10-19 19:51:32 +01:00
Promofaux
8cb72d87e4
make IPv4/IPv6 checking more robust in gravity
2016-10-19 19:50:21 +01:00
Promofaux
49f48e2aaa
wrong word. #admincrimes
2016-10-17 22:24:59 +01:00
Promofaux
8c0f860601
Use systemctl/service calls instead of killall to restart/reload dnsmasq
2016-10-16 17:16:59 +01:00
Promofaux
7ee1110351
ugh. pihole.conf.
2016-10-15 20:09:38 +01:00
Promofaux
51c4c51d9e
Add trap to check existence of setupVars
2016-10-15 20:03:33 +01:00
Promofaux
fc4fe54099
standardise function naming
2016-10-15 20:02:57 +01:00
Promofaux
4c42f00a86
remove uses of ${SUDO} and root check from gravity. As this is handled by pihole
command.
2016-10-15 18:42:53 +01:00
Promofaux
4f35aac6dd
transpose $
and "
2016-10-10 22:32:30 +01:00
Dan Schaper
4418ca9e9f
Missing quote replacement.
2016-10-10 11:41:29 -07:00
Dan Schaper
07b7e8a1a6
Track down a couple more variable name changes.
2016-10-10 06:33:56 -07:00
Dan Schaper
7ae2fc37c0
Match up descriptive variable names with setupVars.conf
. Rectifies Ubuntu 16.04 gravity.list
bug.
2016-10-10 06:23:17 -07:00
Adam Warner
ac49e639bd
Fix #718
2016-09-26 11:58:07 +01:00
bcambl
21d4199a38
Merge branch 'development' into dns-hostname-fixes
2016-09-19 17:33:32 -06:00
Promofaux
3ed62d45f5
Source IP addresses from /etc/pihole/setupVars.conf
2016-09-16 23:05:08 +01:00
bcambl
640af300cb
additional hostname checks in gravity.sh
...
- Test if /etc/hostname exists before attempting to cat the file.
- Add alternative hostname discovery via hostname command
- Add an error message to stdout if unable to determine host fqdn
2016-09-07 21:16:52 -06:00
Promofaux
6796b8bdad
pass argument from pihole command to gravity for -f check
2016-08-19 23:06:56 +01:00
Promofaux
475d016029
hmmm
2016-08-19 22:52:55 +01:00
Promofaux
201304e678
fix variables in gravity to stop it using -f wether it's set or not
2016-08-19 22:51:09 +01:00
Promofaux
f6ac0d73b4
Add force delete option
2016-08-17 19:08:55 +01:00
Promofaux
ae47be0ce9
Add HelpFunc
2016-08-17 18:59:00 +01:00
Dan Schaper
024b741552
Merge pull request #490 from bcambl/fedora-armhf7
...
Fedora Support
2016-06-29 14:25:23 -07:00
Mcat12
4e95f4678f
Merge pull request #540 from pi-hole/bugfix/curl-redirect
...
Have `curl` auto-redirect
2016-06-26 13:42:40 -04:00
Dan Schaper
7670b4e380
Mahakala User Agen modernization
...
Update Curl User Agent for Maha list.
2016-06-25 06:00:49 -07:00
Dan Schaper
636a9123b8
Have curl
auto-redirect
...
This should solve the redirection issue if a list is moved.
2016-06-23 18:37:45 -07:00
bcambl
27a9642090
check for sudo via 'command -v' instead of dkpg-query
2016-06-11 15:58:49 -06:00