Jacob Salmela
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
klaas01
a6313c9e9e
Update gravity.sh
...
Fix kill command and only run as last step.
2015-12-26 14:37:51 -04:00
Dan Schaper
d215fa9ade
Resolve merge confict
2015-12-06 20:22:34 -08:00
Dan Schaper
cb91b8f5fa
Add copyright headers
2015-12-06 05:55:50 -08:00
Dan Schaper
a230df0032
Fix errant )
2015-12-06 05:33:22 -08:00
Dan Schaper
b391afef49
Interface pull for multiple platforms
2015-12-06 04:45:04 -08:00
Dan Schaper
d068593582
Get last IP for selected interface
2015-12-06 00:30:16 -08:00
Dan Schaper
d8034f4156
Get last IP listed for interface
2015-12-05 22:17:28 -08:00
Jacob Salmela
0c3409a028
fixes #111
...
Also clears out some errors users don't need to see
2015-12-04 21:41:37 -06:00
Jacob Salmela
3b9f7031d5
Merge pull request #96 from dschaper/feature/AtomicFunctions
...
Feature/atomic functions
2015-11-27 18:10:51 -06:00
Jacob Salmela
9fe531d1aa
Merge pull request #94 from dschaper/bug/CleanupFiles
...
Bug Fix - Cleanup remnant files
2015-11-27 11:59:47 -06:00
Dan Schaper
9892d06c0d
Code format cleanups
2015-11-26 15:56:37 -08:00
Dan Schaper
d1e475da89
Move black/white list check to pulsar
2015-11-26 15:48:52 -08:00
Dan Schaper
c45dc277b6
Tighten themeatics
2015-11-26 15:29:13 -08:00
Dan Schaper
29ae57465b
Bug Fix - Cleanup Files
2015-11-25 19:51:07 -08:00
Dan Schaper
23856d65e2
IP address detection update
2015-11-25 16:35:36 -08:00
Cole Turner
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
Dan Schaper
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
Dan Schaper
e2b518568e
Forgot to start the directory check function
2015-11-23 12:39:47 -08:00
Dan Schaper
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
Dan Schaper
4f1bb12d36
More functions
...
Splitting into more functions
2015-11-23 03:11:16 -08:00
Dan Schaper
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
Dan Schaper
fe46afd08d
More functions
...
More refactoring
2015-11-23 01:47:24 -08:00
Dan Schaper
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
Dan Schaper
668d14e32d
Add functions
...
Start to add functions for code reuse
2015-11-23 00:36:01 -08:00
Dan Schaper
f02c37ec07
Start code refactor, eliminate some repetitive code
...
Begin code refactor prepatation, prevent DRY where possible.
2015-11-22 23:49:38 -08:00
dschaper
689426180a
Resolve merge conflicts
2015-11-15 13:59:51 +00:00
Dan Schaper
763aa6aa5c
Change shebang to environment
...
Find bash in the environment, not hard coded to path
2015-11-11 00:43:00 -08:00
Jacob Salmela
a7d1b0b42c
Revert "theme addition"
...
This reverts commit e1b8419a07
2015-11-06 17:17:14 -06:00
Jacob Salmela
e1b8419a07
theme addition
...
Further adherence to the science/star trek theme
2015-11-06 17:16:14 -06:00
Jacob Salmela
932d410b66
anal retentive changes
...
OCD
2015-11-06 17:14:05 -06:00
Jacob Salmela
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
Jacob Salmela
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
Jacob Salmela
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
Dan Schaper
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
Dan Schaper
642c31c361
Theme changes
2015-11-05 18:33:05 -08:00
Dan Schaper
8e21488542
hawson memory reductions
2015-11-05 18:22:17 -08:00
Dan Schaper
23eece9443
Upstream Branch pseudo-rebase
2015-11-05 18:11:34 -08:00
Jacob Salmela
a36352dfb6
Merge pull request #58 from Giermann/patch-1
...
add whitespace after $piholeIP
2015-11-04 21:02:58 -06:00
Jacob Salmela
4ad2b68ee1
reverting IPv6 so I can merge lighttpd.conf
2015-10-27 17:16:17 -05:00
Sven Giermann
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
Jacob Salmela
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
Jacob Salmela
ee40bc0423
forgot to redirect it to the file
2015-10-10 14:02:18 -05:00
Jacob Salmela
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
Jacob Salmela
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
Jacob Salmela
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
Jacob Salmela
dfbf1a952f
deleting tabs and spaces
2015-10-10 13:51:21 -05:00
Jacob Salmela
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
Jacob Salmela
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
Jacob Salmela
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
