Mcat12
a96b4d28e1
Merge pull request #1365 from pi-hole/adlistImprovements
...
Adlist improvements
2017-04-06 16:15:50 -04:00
Mcat12
ce86205df0
Use correct agent when downloading adaway.org list
...
See https://discourse.pi-hole.net/t/2278
2017-04-02 12:44:00 -04:00
Adam Warner
02040cd25d
We no longer need to do this, either
2017-03-31 19:23:26 +01:00
Adam Warner
bdc6bd4135
Don't need this comment anymore
2017-03-31 19:18:28 +01:00
Adam Warner
e720de401d
One file to rule them all, same functionality (made changes and want to go back to default? Delete your adlists.list)
2017-03-31 19:16:09 +01:00
Adam Warner
ce97896ffd
account for new adlists.custom file
2017-03-31 19:00:04 +01:00
DL6ER
d7b5870ba6
Use absolute path for pihole command in gravity.sh. Fixes #1318
2017-03-12 23:15:23 +01:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files
2017-02-22 11:55:20 -06:00
Markus Napp
66616eb0f0
Rename missing plurals check
2017-02-01 19:55:33 +01:00
Markus Napp
72a1fc3f64
Fix output for wildcards in gravity.sh
2017-02-01 00:07:47 +01:00
DL6ER
a8ac212ee6
Show number of wildcard blocked domains in gravity's summary
2017-01-29 13:46:27 +01:00
Promofaux
c2e1819098
This should not have been commented out. It's stopping any changes we make to the default lists getting out.
2017-01-17 19:48:20 +00:00
DL6ER
322cb2387b
Also accept the last line of the adlist file if there is no newline at the end
2017-01-13 11:02:51 +01:00
DL6ER
cd0c3f9418
Better output if file has not been downloaded because it has not been changed
2016-12-17 23:46:28 +01:00
DL6ER
efaee2b68b
Improvements for gravity (errors shouldn't be able to escape the black hole if even light cannot do this!)
2016-12-17 23:33:09 +01:00
Promofaux
a3d519b671
no need to remove list, because of echo >
2016-12-14 19:33:15 +00:00
Promofaux
8591f9d576
check for list before removing it
2016-12-14 19:31:57 +00:00
Promofaux
db89fa9881
initial support for additional hosts file
2016-12-14 19:26:55 +00:00
Mcat12
d8912fd0a7
Merge pull request #952 from pi-hole/fix/exit_codes
...
Fix/exit codes
2016-12-01 18:24:30 -05:00
Dan Schaper
d92646324c
Double worded
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 13:59:58 -08:00
Dan Schaper
c9fe62a691
Clarify what the command is doing.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 13:58:40 -08:00
Dan Schaper
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 12:21:08 -08:00
Adam Warner
c97cfde9f9
Update gravity.sh
...
Only include domain part of lines that contain `/` e.g `www.fakenewswatch.com/megynkelly`
2016-11-21 22:51:59 +00:00
DL6ER
cdee6d55d3
Minor change
2016-11-20 17:40:22 +01:00
DL6ER
e5a1afaa26
Added another missing "done"
2016-11-20 17:31:27 +01:00
Mcat12
08e7b7e0ad
Fix typo
2016-11-19 14:00:56 -05:00
DL6ER
4945f33254
Added "-n" to first echo call
2016-11-18 17:39:34 +01:00
DL6ER
3fa05293fc
Fixed file permissions
2016-11-18 17:37:13 +01:00
DL6ER
27e5f2798d
Added missing "done." output
2016-11-18 17:33:46 +01:00
Adam Warner
99057ed859
Update var names from setupVars.conf in gravity.sh
2016-11-02 04:21:54 -07:00
Adam Warner
21fc6344bf
Merge pull request #849 from pi-hole/aManHasNoNameResolution
...
[BugFix] A man has no name resolution
2016-10-27 19:41:07 +01:00
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
Adam Warner
e0ac109dd1
remove hostname insertion into gravity.list from gravity.sh
2016-10-25 15:07:29 +01:00
Adam Warner
7653b3d088
Remove pi.hole references in gravity.sh
2016-10-25 15:01:16 +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
