7b8fa3b922
Permissions changed for /etc/pihole and cleaned up some output
2016-04-01 01:11:59 -05:00
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
2016-03-31 20:25:54 -05:00
45f24c8a85
Readded `cat`s that were originally considered UUOC
2016-03-30 19:56:11 -05:00
f8427ab789
Merge remote-tracking branch 'refs/remotes/pi-hole/development'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-29 12:57:22 -05:00
31fc2bfeb7
Modified gravity.sh to point to new file locations and fixed permission issue
2016-03-29 00:25:40 -05:00
37c1999965
Merged branch ScriptCleanup-Dev into development
2016-03-28 18:46:08 -05:00
86dd4dd784
New spinner for gravity.sh
...
Spinner in gravity.sh now matches basic-install.sh and uninstall.sh
2016-03-28 18:45:55 -05:00
00b65abd09
Minor changes to reflect new tool usage
...
Removed symlink of scripts to u/l/b
Added copy for setupLCD to /opt/pihole/
New spinner added to gravity.sh to reflect new spinner in basic-install.sh and uninstall.sh
2016-03-28 18:44:54 -05:00
f2150ee7e1
Merge conflict resolution
2016-03-28 13:07:51 -05:00
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
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
0b9e78df2c
Cleaned code and added prompt for purge on uninstall
2016-03-26 16:57:01 -05:00
e4ddf8bc33
remove trailing whitespace gravity.sh
2016-03-05 21:13:43 -08:00
88674e21cf
Update gravity.sh
...
Clear out `pihole.*` files from `/etc/pihole` as they are no longer needed.
2016-02-21 20:45:56 +00:00
bffc77e478
Add support for comments and blank lines in adlists.default/adlists.list
2016-02-21 17:45:25 +00:00
b7cb3df9bc
Merge pull request #305 from fayetted/Issue_304
...
Set file permisions on `/etc/pihole` directory. fixes #304
2016-02-16 22:54:54 +00:00
3a887af513
Addresses #313
...
path to white and blacklist scripts moved to variables and updated to include full path
2016-02-14 22:24:21 +00:00
af360a1a20
Merge pull request #298 from fayetted/Issue_297
...
Fixes gravity_transport variable interpretation.
2016-02-10 20:10:05 -05:00
73bfbba5f7
Set file permisions on /etc/pihole
...
Ensures file permisions on $piholeDir before reload/restart of dnsmasq
2016-02-10 15:07:31 -06:00
a734927591
Fixes gravity_transport variable interpretation.
...
Adding (") around Variables passed to function ensures
spaces are handled and that missing arguments are
accounted for.
2016-02-09 19:51:03 -06:00
5111880edf
remove erroneous -o
2016-01-27 22:35:52 +00:00
b75b290351
adlists.default copied on each run of gravity. In case it has been overwritten
2016-01-27 21:14:23 +00:00
352ebc3193
outsource list of adlists to a file in /etc/pihole/.
2016-01-26 20:26:09 +00:00
e87443b3e4
add ' http://mirror1.malwaredomains.com/files/justdomains ' to list of ad-list sources, can be removed if it causes problems
2016-01-25 15:53:49 +00:00
74ea597bd8
Cosmetic enhancement. Add the domain 'Pi-Hole.IsWorking.OK' to the top of the domain list to return a friendlier looking domain when pinging a blocked host!
2016-01-25 15:52:22 +00:00
6b76270889
Remove spinner call when adding URLs of adlist to array.. seems to break it.
2016-01-24 22:30:12 +00:00
cebdcc71a7
Add $SUDO call to spinner() in gravity.sh
2016-01-24 21:27:25 +00:00
39507b9d0d
Added echo ':::' to the top of the file
2016-01-24 16:47:38 +00:00
a539dc41f3
Tidy up gravity output to match install script
2016-01-24 15:25:24 +00:00
8b18fdd322
Update gravity.sh
2016-01-21 17:19:09 -05:00
1349f584be
Use Sudo Detection from Installer in Gravity.sh Also
...
Prevents errors from being thrown when gravity.sh is run as root and the user doesn't have sudo installed (just like install.sh does)
2016-01-21 17:14:55 -05:00
5d842a7533
Merging
2016-01-15 18:45:12 +00:00
2284a27814
Consumes blacklist.sh now, too.
2016-01-15 15:54:11 +00:00
cc62d984d2
Changed whitelist function to outsource to whitelist.sh
2016-01-15 14:49:16 +00:00
ca5e34a9a9
Merge branch 'master' into whitelist
...
# Conflicts:
# gravity.sh
2016-01-14 18:12:45 -06:00
3fc1817e7a
Merge branch 'master' into ipv6
2016-01-01 18:34:33 -06:00
987e4e02a9
Fix bug in gravity.sh where IPv6 list was not always populated
...
Failed to be populated if /tmp/piholeIP does not exist. This may happen under
the following conditions:
- was not generated during install
- gravity.sh being run again after the original install (the file is deleted
during the installation process)
2016-01-01 14:11:46 +00:00
d646612a25
Block ads over IPv6
...
I’m pretty sure this works well. Maybe someone else can try it out.
2015-12-31 20:26:05 -06:00
26dcbfc1f9
hide minor error
...
An error shows up on the first install that `latentWhitelist.txt` doesn't exist and can't be removed. Redirecting STDERR should fix this.
2015-12-27 12:25:35 -06:00
a6313c9e9e
Update gravity.sh
...
Fix kill command and only run as last step.
2015-12-26 14:37:51 -04:00
c88982d0d5
chmod doesn't apply at initial install
2015-12-09 15:52:53 -06:00
d215fa9ade
Resolve merge confict
2015-12-06 20:22:34 -08:00
cb91b8f5fa
Add copyright headers
2015-12-06 05:55:50 -08:00
a230df0032
Fix errant )
2015-12-06 05:33:22 -08:00
b391afef49
Interface pull for multiple platforms
2015-12-06 04:45:04 -08:00
d068593582
Get last IP for selected interface
2015-12-06 00:30:16 -08:00
d8034f4156
Get last IP listed for interface
2015-12-05 22:17:28 -08:00
0c3409a028
fixes #111
...
Also clears out some errors users don't need to see
2015-12-04 21:41:37 -06:00
3b9f7031d5
Merge pull request #96 from dschaper/feature/AtomicFunctions
...
Feature/atomic functions
2015-11-27 18:10:51 -06:00
9fe531d1aa
Merge pull request #94 from dschaper/bug/CleanupFiles
...
Bug Fix - Cleanup remnant files
2015-11-27 11:59:47 -06:00
9892d06c0d
Code format cleanups
2015-11-26 15:56:37 -08:00
d1e475da89
Move black/white list check to pulsar
2015-11-26 15:48:52 -08:00
c45dc277b6
Tighten themeatics
2015-11-26 15:29:13 -08:00
29ae57465b
Bug Fix - Cleanup Files
2015-11-25 19:51:07 -08:00
23856d65e2
IP address detection update
2015-11-25 16:35:36 -08:00
03bbef07b5
pinholeIP should only use one IP
...
Updated piholeIP because if there are multiple network adapters, the gravity list will populate incorrectly with both IP addresses. Only one address should be used.
2015-11-25 13:36:39 -08:00
20399b8262
Build array of active domains to concatenate
...
Fix #86 Builds an array of active domains, and then loops through that list to pick files to concatenate after truncating Matter.
2015-11-23 13:12:11 -08:00
e2b518568e
Forgot to start the directory check function
2015-11-23 12:39:47 -08:00
a5d29a1048
Fix function ordering
...
Unique is now called after the comments are scrubbed from the unified domain list.
2015-11-23 03:26:10 -08:00
4f1bb12d36
More functions
...
Splitting into more functions
2015-11-23 03:11:16 -08:00
af909e0ee6
Copyright issues
...
Some of the blocklists are copyright and need to be pulled and stored as is. They can be processed further in the script to remove comments.
2015-11-23 02:52:12 -08:00
fe46afd08d
More functions
...
More refactoring
2015-11-23 01:47:24 -08:00
a1e609d005
Ugly hack permissions
...
Temporary hack for /etc/pihole directory and file permissions to pull out sudo requirement. (Irony is that is requires sudo.) This will be fixed later, but for now it's needed for existing installs so they don't break.
2015-11-23 01:16:00 -08:00
668d14e32d
Add functions
...
Start to add functions for code reuse
2015-11-23 00:36:01 -08:00
f02c37ec07
Start code refactor, eliminate some repetitive code
...
Begin code refactor prepatation, prevent DRY where possible.
2015-11-22 23:49:38 -08:00
689426180a
Resolve merge conflicts
2015-11-15 13:59:51 +00:00
763aa6aa5c
Change shebang to environment
...
Find bash in the environment, not hard coded to path
2015-11-11 00:43:00 -08:00
a7d1b0b42c
Revert "theme addition"
...
This reverts commit e1b8419a07
2015-11-06 17:17:14 -06:00
e1b8419a07
theme addition
...
Further adherence to the science/star trek theme
2015-11-06 17:16:14 -06:00
932d410b66
anal retentive changes
...
OCD
2015-11-06 17:14:05 -06:00
c297a86211
decluttering output
...
I love the adherence to the theme, but this line makes it difficult to
quickly read what is happening.
2015-11-06 17:10:17 -06:00
1b65193fe4
new hostsfile url
...
This seems to be the more appropriate URL:
http://hosts-file.net/ad_servers.txt .
I compared it to the original URL using opendiff and they are exactly
the same.
2015-11-06 17:05:04 -06:00
a06098bb16
remove filename from whitelist output
...
I also cleared the whitespace (or rather, Atom did).
I moved the pinhole.conf to it's current location
I commented out mahakala
2015-11-06 17:03:55 -06:00
15b9fb68d7
Remove filename from wc
...
Line 118 and Line 127 changed wc to remove filename from output.
2015-11-06 10:24:12 -08:00
642c31c361
Theme changes
2015-11-05 18:33:05 -08:00
8e21488542
hawson memory reductions
2015-11-05 18:22:17 -08:00
23eece9443
Upstream Branch pseudo-rebase
2015-11-05 18:11:34 -08:00
a36352dfb6
Merge pull request #58 from Giermann/patch-1
...
add whitespace after $piholeIP
2015-11-04 21:02:58 -06:00
4ad2b68ee1
reverting IPv6 so I can merge lighttpd.conf
2015-10-27 17:16:17 -05:00
d5ffec64f2
add whitespace after $piholeIP
...
In my case there had been no whitespace in piholeIP (I configured it statically because 'hostname -I' returns multiple IP addresses, which ends in errornous hosts file), so it's more safe to add one between IP and hostname.
Further, I removed the obsolete latentBlacklist variable.
2015-10-22 15:17:44 +02:00
963eacfe05
commenting out mahakala list
...
Due to so many users having issues with this list blocking legitimate
domains such as microsoft.com, apple.com, xkcd.com and more, I am
turning it off by default. While this drastically reduces the amount
of domains blocked, ad-blocking performance still seems to function
quite well.
Long-time users can simply uncomment the list, but this will make it so
new users have a more pleasant experience.
If you already have the mahakala list, you will need to remove it first
with this command:
sudo rm /etc/pihole/list.2.adblock.mahakala.is.domains
There are a few other lists I am looking at including, but this will
provide an immediate fix.
2015-10-11 09:28:11 -05:00
ee40bc0423
forgot to redirect it to the file
2015-10-10 14:02:18 -05:00
428d5e9a06
Revert "new command to print both the IPv4 and IPv6 address on their own line"
...
This reverts commit 88e6ce041d
2015-10-10 14:01:10 -05:00
88e6ce041d
new command to print both the IPv4 and IPv6 address on their own line
...
I'm not 100% sure if you can add multiple IP addresses to one domain on
a single line, so I just broke it up into two. It makes the file
bigger and longer, but I'll have to see how it works
2015-10-10 13:55:49 -05:00
e3c0fdfeb7
new variables for IPv4 and IPv6
...
The IPv6 address looks for the one created from the MAC address.
2015-10-10 13:52:54 -05:00
dfbf1a952f
deleting tabs and spaces
2015-10-10 13:51:21 -05:00
6976532ef5
Removing IP as input
...
Due to users having issues with the IP not being entered properly, I am restoring the original way to store `piholeIP` until a better solution can be formed.
2015-10-06 06:12:52 -05:00
d52fdde2f8
using double bracket notation
...
Despite the script running successfully, it produced this error:
`/usr/local/bin/gravity.sh: line 8: [: missing `]'`
prior to this fix.
2015-10-03 11:06:50 -05:00
533f707578
Merge pull request #45 from jofrep/IP-as-input-parameter
...
Allow external IP as an input script parameter
2015-10-03 11:05:52 -05:00
4ea397bc71
Removed extra blank space if no IP added
2015-09-28 17:40:13 +02:00
885069d440
Allow external IP as an input script parameter: ./gravity.sh 123.123.123.123
2015-09-18 23:06:29 +02:00
cfac2be334
toggle test case for noswap
2015-09-13 15:23:29 -04:00
4a4db7ab56
Allow for local settings to disable swap
2015-09-11 22:54:37 -04:00
e19a6c3624
Merge pull request #38 from korhadris/master
...
Fixes #32 and fixes #35
2015-09-06 10:11:39 -05:00
fa77b7b69d
increase swap to fix #37 memory error
...
This will increase the swap file to 500MB before downloading the lists.
Most of the issue comes from the mahakala list, which is so large. If
no swap file is found, one is created.
2015-08-25 18:01:54 -05:00
98c94912e1
Replace use of grep -w with grep -x.
...
Prepend "^" to start of latentWhitelist.txt lines.
The -x switch requires a full line match of the regexp, where as -w
will try to find the match somewhere in the line, looking for work
breaks. Combined with turning the whitelist lines into full regexps,
this results in significantly faster parsing.
Having "^" prepended to the lines also keeps false whitelisting from
occuring, such as the following example:
If whitelist.txt contains "google.com" it would whitelist many other
sites that end in "google.com" as long as there is a non-word
character preceeding the google (such as "-", or ".").
2015-08-22 23:37:01 -07:00
a26377d229
Append ad list sources to latentWhitelist.txt to prevent them from being filtered.
...
Additional fixes for #35 . This will prevent our own sources from being
filtered out by competing source lists.
2015-08-22 21:44:41 -07:00
e464c04490
Ignore domains in ad lists that do not contain `.` characters.
...
This will skip entries such as `localhost`, `android`, `debian` and
empty lines as listed in #35 .
2015-08-22 17:47:22 -07:00
bb7db11214
Changing printouts when updating sources to tell what is going on when
...
manually running gravity.sh
This will print "Getting $domain list... " for each domain, followed
by either "Done" if data was received and validated, or "Skipping
list because it does not have any new entries" if no updates were
needed.
2015-08-22 17:33:30 -07:00
1f29d01694
Remove leading and trailing whitespace and `.` characters and
...
duplicate `.` characters as each list is stored.
Should fix #32 .
2015-08-22 17:05:19 -07:00
d6d192cb0a
Use `url` variable to store `${sources[$i]}` value to improve readability.
...
I also wanted to replace the for loop iterating over indices with
something like:
`for url in $sources[@]}`
It made the use of `$i` in the save location more annoying though.
2015-08-22 16:22:07 -07:00
0ec6eab683
Appending ".$justDomainsExtension" to $saveLocation variable.
...
Every use of $saveLocation was adding this and making lines
longer.
2015-08-22 16:04:54 -07:00
159b29b80b
Replace spaces with tabs to make indentation consistent within the file.
2015-08-22 15:56:32 -07:00
9d99a4ef36
Patch 3 - Dont use /etc/hosts
...
/etc/pihole/gravity.list now stores the block list. Ensures the
/etc/hosts file is left untouched.
2015-07-30 17:24:24 +01:00
563db80b6d
resolves #25
...
Will not count blank lines if they happen to exist.
2015-07-17 20:49:03 -05:00
8f961c1aaa
resolves #22
...
This lets dnsmasq re-read the hosts file without disturbing the daemon.
So any new entries can be used as soon as gravity.sh is finished
running
2015-07-17 13:05:38 -05:00
f6ccb4b658
Merge remote-tracking branch 'upstream/master'
2015-07-13 09:55:53 -07:00
37e926ce84
Parses host only file formats now. Previously only handled hosts file format.
...
Specifically, it can now handle the following list:
'http://mirror1.malwaredomains.com/files/justdomains '
2015-07-13 09:28:45 -07:00
5c4bfb84b0
uses a variable for hostname instead of raspberrypi
...
Some people use a hostname other than raspberrypi, so their hostname
did not resolve to 127.0.0.1. I replaced that hardcoded value with a
variable so that does not happen.
I also added a few comments and minor formatting adjustments,.
2015-07-13 06:59:22 -05:00
552f980430
blacklist was being concatenated with wrong matter
2015-06-22 13:33:02 -07:00
66bb0e7bb3
Strip carriage returns on matter so that whitelists work correctly. Lines that had \r would not match.
2015-06-22 13:03:15 -07:00
e9324f8316
Use double brackets for the test.
2015-06-19 17:54:12 -07:00
67aba8c496
If exists, import a config file to allow for overriding script variables.
2015-06-19 13:31:51 -07:00
01ac3c1dd3
Ditching the use of the loopback
...
Pushing files so they are available when the new article gets posted.
If the Pi's loopback is set in the hosts file, clients using it as a
DNS server will try to connect to their own loopback, which does not
have a Web server. So the real IP of the Pi is used. It is
recommended to use a static IP since this will be acting as a server.
Made one small change from some hard coded values to a variable.
2015-06-13 22:01:12 -05:00
c563841714
changing the origin folder
...
Originally, I had this set to /run/shm (in RAM) but ran into errors
when the list reached 900,000 entries.
Then I moved it to /tmp.
Finally, I decided to just put the files in the pihole dir so they are
available after reboots. This will help with only downloading the
lists when absolutely needed--respecting the bandwidth of the people
serving the lists.
It is also possible to add addn-hosts=/path/to/hosts.conf within the
dnsmasq.conf file if you don't want to use hosts. For simplicity and
speed, I just use the regular hosts file.
2015-06-06 23:34:32 -05:00
457b70f5c5
add IPv6 support in the hosts file
...
Still need to get lighted to use IPv6. I am doing this because some
ads can get through using IPv6 if the IPv4 version is blocked. Also,
it seems to work fine as far as performance even though it doubles the
file size...
Also added a few comments for better documentation.
2015-06-04 08:21:44 -05:00
61c99ff145
forgot to change origin dir
2015-05-19 13:32:37 -05:00
56c776af22
hosts format script
2015-05-19 13:31:37 -05:00
18d6f4b747
initial commit
2014-09-26 09:28:44 -05:00
8569c419c1
added file path
2014-06-10 20:22:26 -05:00
2af19a0194
added cmd to restart dns
2014-06-08 10:14:54 -05:00
2131149fda
Create gravity.sh
2014-06-08 10:03:56 -05:00
nate
Carter Maxwell
Adam Warner
Promofaux
Mcat12
Daniel Fayette
Adam Warner
Leo
jacobsalmela
Jacob Salmela
Clinton
klaas01
Dan Schaper
Cole Turner
Dan Schaper
Sven Giermann
Jofre Palau
Jesse Becker
jacobsalmela
korhadris
Fourdee
rmceoin