Commit graph

87 commits

Author SHA1 Message Date
pizzafritta
5f931553b9 grep whitelist misplaced 2015-03-30 22:59:18 +02:00
pizzafritta
a8eda1c289 Output shorter deleting subdomains when possible
what's new:
- sorting not necessary on every source, it's already executed at the end
- comments are allowed in blacklist and in whitelist. Everything following the symbol '#' is considered comment, even if it's not at the beginning of the line
- blank lines are allowed in blacklist and whitelist.
- tested this with awk (mac), mawk (raspbian) and also with gawk.
- bugfix
...
- subdomains removed from output when domain already exists
- output sorted in reverse order (right to left)
- filepaths defined at the top of the code.
- subdomains of items in whitelist/blacklist are whitelisted/blacklisted too
2015-03-30 13:08:32 +02:00
Jacob Salmela
15c84db022 Merge pull request #9 from mospaeda/master
Add a local blacklist file
2015-03-29 12:55:34 -05:00
Jacob Salmela
33692df4a9 featured on tech blogs 2015-03-27 19:20:39 -05:00
mospaeda
a11fe15d1b Automatic detection via hostname command 2015-03-23 19:47:35 +01:00
mospaeda
5d37b59768 Blacklist and automatic detection of IP address
detection is valid for all languages
2015-03-23 19:43:13 +01:00
mospaeda
89556f2480 Merge pull request #2 from jacobsalmela/master
Giving the README some much needed love
2015-03-21 00:31:29 +01:00
mospaeda
6edd8a828d Merge pull request #1 from mospaeda/mospaeda-patch-1
Automatic IP detection with all locale
2015-03-21 00:07:58 +01:00
mospaeda
d586ba3126 Automatic IP detection with all locale 2015-03-21 00:00:09 +01:00
mospaeda
7809ee386e Update gravity-adv.sh 2015-03-20 23:37:04 +01:00
Jacob Salmela
0ae8168351 Giving the README some much needed love 2015-03-20 12:50:49 -05:00
Mospaeda
185969b137 Update gravity-adv.sh
Add a local blacklist file
2015-03-19 23:09:36 +01:00
Mospaeda
5f3cb2e569 Update gravity-adv.sh 2015-03-19 22:59:55 +01:00
jacobsalmela
a8874fb606 Fixes #6 whitelist not found when using sudo
This fixes #6 by changing the location of the whitelist.txt file.
Instead of storing it in the current users home folder, it should be
created in /etc/pihole.  The script will also create the directory if
it does not exist, but will not add a whitelist.txt by default.  You
would still need to go back and manually add one.  But this directory
will be used to store other support files as the script improves.

I also added sudo commands to the commands requiring elevation.

Finally, changed the comment to reflect a more accurate number of
domains getting blocked.
2015-03-10 12:27:57 -05:00
jacobsalmela
b5cf6de4a3 Fixes issue #2 whitelist support
Just put a file named whitelist.txt in your home folder.  This file
should contain one domain per line that needs to be whitelisted.  If
the file does not exists, the script will continue as normal.
2015-02-22 17:54:03 -06:00
jacobsalmela
e1d79ffb0a 1x1 png for ads instead of blank space
http://jacobsalmela.com/raspberry-pi-ad-blocker-advanced-setup/#comment-
1859336435

Instead of serving up a blank Webpage, a small image will be displayed,
which should improve and eliminate any of the empty boxes where ads
used to be.
2015-02-18 08:25:31 -06:00
jacobsalmela
47baa1a6fd Removes more duplicates that uniq could not find
http://jacobsalmela.com/raspberry-pi-ad-blocker-advanced-setup/#comment-
1860675175

Thanks to napgravy for figuring this out.  It seems the DOS-style
line-endings that prevented uniq from getting rid of them.  This
reduces the ad domains from ~140,000 to around ~120,000 but it is much
more accurate.
2015-02-17 16:10:28 -06:00
jacobsalmela
b7573a533a Now blocks over 140,000 ad domains
In addition to the extra domains, there are numerous performance
improvements so the script runs faster.  There were also some
extraneous domains that were either blank or had some special
characters that needed to be removed.

Since the ad lists are not under my control, the end of the script will
now tell you how many domains will be blocked.  In case the sources it
pulls from ever update, you can run this script again and see the
difference.
2015-02-17 13:52:54 -06:00
jacobsalmela
fe4e579005 working copy (I think)
for use with the upcoming Raspberry Pi, ad-blocking, wireless router.
2015-02-08 17:17:45 -06:00
jacobsalmela
eb4d2382cd oops im a n00b 2015-02-08 17:06:43 -06:00
jacobsalmela
b7e6c4ec28 comment 2015-02-08 17:03:34 -06:00
jacobsalmela
32246e2e15 using loopback 2015-02-08 16:58:47 -06:00
Jacob Salmela
a2575dabf0 Merge pull request #1 from dwin999/master
90% speed improvement thanks to dwin999.
2015-01-24 21:33:00 -06:00
dwin999
1fd32687e6 Update gravity-adv.sh
This works much faster.
2015-01-25 01:11:28 +00:00
jacobsalmela
55ebc0e492 fixing dns 2014-12-20 13:10:58 -06:00
jacobsalmela
ebeb25d4ae initial commit 2014-12-20 13:09:52 -06:00
jacobsalmela
ea5616d3b3 escaping ascii art 2014-12-20 12:44:36 -06:00
jacobsalmela
4ba3ba2ef5 initial commit - unstable 2014-12-20 12:43:10 -06:00
jacobsalmela
925e8630ca initial commit 2014-12-20 12:41:36 -06:00
jacobsalmela
60cc27a978 file for automated install 2014-12-20 12:23:33 -06:00
jacobsalmela
72209cbac0 file for automated install 2014-12-20 12:22:30 -06:00
jacobsalmela
9b65c112d9 index for original pi-hole 2014-11-18 13:10:49 -06:00
jacobsalmela
3d665ff155 hulu ad config file and fewer domains
troubleshooting
2014-11-14 17:03:06 -06:00
jacobsalmela
60f0eb1f5e initial commit 2014-11-13 18:28:11 -06:00
jacobsalmela
c68bb0184e removing resolve entries 2014-11-13 18:26:36 -06:00
jacobsalmela
4030732bd2 getting rid of using resolv file 2014-11-13 18:24:04 -06:00
jacobsalmela
a7d19d9559 trying to determine urls again 2014-11-13 17:02:17 -06:00
Jacob Salmela
8c568445d6 another ad list 2014-11-12 14:18:05 -06:00
jacobsalmela
fbc94f6361 more domains 2014-11-02 14:13:43 -06:00
jacobsalmela
5d0a76c21a typo 2014-11-02 14:07:24 -06:00
jacobsalmela
5b0d217186 dnsmasq and resolv 2014-11-02 14:05:27 -06:00
jacobsalmela
ee3aa737a2 dns config file 2014-11-02 13:40:51 -06:00
jacobsalmela
fc3b199e84 dnsmasq.conf for hulu 2014-11-02 13:36:06 -06:00
jacobsalmela
f09ce63153 ~ 2014-10-17 19:23:22 -05:00
jacobsalmela
ac1c5ef3f7 removed hosts 2014-10-17 19:20:01 -05:00
Jacob Salmela
a76c01f137 Update setup-resolv.sh 2014-10-17 19:16:41 -05:00
Jacob Salmela
20d710de86 Update setup-resolv.sh 2014-10-17 19:14:49 -05:00
Jacob Salmela
3f0dfa7c98 Create setup-resolv.sh 2014-10-17 19:12:45 -05:00
Jacob Salmela
1e4e65e2c0 Update gravity-adv.sh 2014-10-17 18:46:15 -05:00
jacobsalmela
cb11963981 more domains 2014-10-12 13:45:12 -05:00