nate
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
9 years ago
nate
f2150ee7e1
Merge conflict resolution
9 years ago
nate
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
9 years ago
nate
8ef4c12f97
Merge branch 'ScriptCleanup'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
9 years ago
nate
0b9e78df2c
Cleaned code and added prompt for purge on uninstall
9 years ago
Carter Maxwell
e4ddf8bc33
remove trailing whitespace gravity.sh
9 years ago
Adam Warner
88674e21cf
Update gravity.sh
...
Clear out `pihole.*` files from `/etc/pihole` as they are no longer needed.
9 years ago
Promofaux
bffc77e478
Add support for comments and blank lines in adlists.default/adlists.list
9 years ago
Adam Warner
b7cb3df9bc
Merge pull request #305 from fayetted/Issue_304
...
Set file permisions on `/etc/pihole` directory. fixes #304
9 years ago
Adam Warner
3a887af513
Addresses #313
...
path to white and blacklist scripts moved to variables and updated to include full path
9 years ago
Mcat12
af360a1a20
Merge pull request #298 from fayetted/Issue_297
...
Fixes gravity_transport variable interpretation.
9 years ago
Daniel Fayette
73bfbba5f7
Set file permisions on /etc/pihole
...
Ensures file permisions on $piholeDir before reload/restart of dnsmasq
9 years ago
Daniel Fayette
a734927591
Fixes gravity_transport variable interpretation.
...
Adding (") around Variables passed to function ensures
spaces are handled and that missing arguments are
accounted for.
9 years ago
Promofaux
5111880edf
remove erroneous -o
9 years ago
Promofaux
b75b290351
adlists.default copied on each run of gravity. In case it has been overwritten
9 years ago
Promofaux
352ebc3193
outsource list of adlists to a file in /etc/pihole/.
9 years ago
Adam Warner
e87443b3e4
add ' http://mirror1.malwaredomains.com/files/justdomains ' to list of ad-list sources, can be removed if it causes problems
9 years ago
Adam Warner
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!
9 years ago
Promofaux
6b76270889
Remove spinner call when adding URLs of adlist to array.. seems to break it.
9 years ago
Promofaux
cebdcc71a7
Add $SUDO call to spinner() in gravity.sh
9 years ago
Promofaux
39507b9d0d
Added echo ':::' to the top of the file
9 years ago
Promofaux
a539dc41f3
Tidy up gravity output to match install script
9 years ago
Leo
8b18fdd322
Update gravity.sh
9 years ago
Leo
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)
9 years ago
Adam Warner
5d842a7533
Merging
9 years ago
Adam Warner
2284a27814
Consumes blacklist.sh now, too.
9 years ago
Adam Warner
cc62d984d2
Changed whitelist function to outsource to whitelist.sh
9 years ago
jacobsalmela
ca5e34a9a9
Merge branch 'master' into whitelist
...
# Conflicts:
# gravity.sh
9 years ago
Jacob Salmela
3fc1817e7a
Merge branch 'master' into ipv6
9 years ago
Clinton
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)
9 years ago
Salmela
d646612a25
Block ads over IPv6
...
I’m pretty sure this works well. Maybe someone else can try it out.
9 years ago
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.
9 years ago
klaas01
a6313c9e9e
Update gravity.sh
...
Fix kill command and only run as last step.
9 years ago
Jacob Salmela
c88982d0d5
chmod doesn't apply at initial install
9 years ago
Dan Schaper
d215fa9ade
Resolve merge confict
9 years ago
Dan Schaper
cb91b8f5fa
Add copyright headers
9 years ago
Dan Schaper
a230df0032
Fix errant )
9 years ago
Dan Schaper
b391afef49
Interface pull for multiple platforms
9 years ago
Dan Schaper
d068593582
Get last IP for selected interface
9 years ago
Dan Schaper
d8034f4156
Get last IP listed for interface
9 years ago
Jacob Salmela
0c3409a028
fixes #111
...
Also clears out some errors users don't need to see
9 years ago
Jacob Salmela
3b9f7031d5
Merge pull request #96 from dschaper/feature/AtomicFunctions
...
Feature/atomic functions
9 years ago
Jacob Salmela
9fe531d1aa
Merge pull request #94 from dschaper/bug/CleanupFiles
...
Bug Fix - Cleanup remnant files
9 years ago
Dan Schaper
9892d06c0d
Code format cleanups
9 years ago
Dan Schaper
d1e475da89
Move black/white list check to pulsar
9 years ago
Dan Schaper
c45dc277b6
Tighten themeatics
9 years ago
Dan Schaper
29ae57465b
Bug Fix - Cleanup Files
9 years ago
Dan Schaper
23856d65e2
IP address detection update
9 years ago
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.
9 years ago
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.
9 years ago
Dan Schaper
e2b518568e
Forgot to start the directory check function
9 years ago
Dan Schaper
a5d29a1048
Fix function ordering
...
Unique is now called after the comments are scrubbed from the unified domain list.
9 years ago
Dan Schaper
4f1bb12d36
More functions
...
Splitting into more functions
9 years ago
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.
9 years ago
Dan Schaper
fe46afd08d
More functions
...
More refactoring
9 years ago
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.
9 years ago
Dan Schaper
668d14e32d
Add functions
...
Start to add functions for code reuse
9 years ago
Dan Schaper
f02c37ec07
Start code refactor, eliminate some repetitive code
...
Begin code refactor prepatation, prevent DRY where possible.
9 years ago
dschaper
689426180a
Resolve merge conflicts
9 years ago
Dan Schaper
763aa6aa5c
Change shebang to environment
...
Find bash in the environment, not hard coded to path
9 years ago
Jacob Salmela
a7d1b0b42c
Revert "theme addition"
...
This reverts commit e1b8419a07
.
9 years ago
Jacob Salmela
e1b8419a07
theme addition
...
Further adherence to the science/star trek theme
9 years ago
Jacob Salmela
932d410b66
anal retentive changes
...
OCD
9 years ago
Jacob Salmela
c297a86211
decluttering output
...
I love the adherence to the theme, but this line makes it difficult to
quickly read what is happening.
9 years ago
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.
9 years ago
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
9 years ago
Dan Schaper
15b9fb68d7
Remove filename from wc
...
Line 118 and Line 127 changed wc to remove filename from output.
9 years ago
Dan Schaper
642c31c361
Theme changes
9 years ago
Dan Schaper
8e21488542
hawson memory reductions
9 years ago
Dan Schaper
23eece9443
Upstream Branch pseudo-rebase
9 years ago
Jacob Salmela
a36352dfb6
Merge pull request #58 from Giermann/patch-1
...
add whitespace after $piholeIP
9 years ago
Jacob Salmela
4ad2b68ee1
reverting IPv6 so I can merge lighttpd.conf
9 years ago
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.
9 years ago
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.
9 years ago
Jacob Salmela
ee40bc0423
forgot to redirect it to the file
9 years ago
Jacob Salmela
428d5e9a06
Revert "new command to print both the IPv4 and IPv6 address on their own line"
...
This reverts commit 88e6ce041d
.
9 years ago
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
9 years ago
Jacob Salmela
e3c0fdfeb7
new variables for IPv4 and IPv6
...
The IPv6 address looks for the one created from the MAC address.
9 years ago
Jacob Salmela
dfbf1a952f
deleting tabs and spaces
9 years ago
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.
9 years ago
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.
9 years ago
Jacob Salmela
533f707578
Merge pull request #45 from jofrep/IP-as-input-parameter
...
Allow external IP as an input script parameter
9 years ago
Jofre Palau
4ea397bc71
Removed extra blank space if no IP added
9 years ago
Jofre Palau
885069d440
Allow external IP as an input script parameter: ./gravity.sh 123.123.123.123
9 years ago
Jesse Becker
cfac2be334
toggle test case for noswap
9 years ago
Jesse Becker
4a4db7ab56
Allow for local settings to disable swap
9 years ago
Jacob Salmela
e19a6c3624
Merge pull request #38 from korhadris/master
...
Fixes #32 and fixes #35
9 years ago
jacobsalmela
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.
9 years ago
korhadris
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 ".").
9 years ago
korhadris
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.
9 years ago
korhadris
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 .
9 years ago
korhadris
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.
9 years ago
korhadris
1f29d01694
Remove leading and trailing whitespace and `.` characters and
...
duplicate `.` characters as each list is stored.
Should fix #32 .
9 years ago
korhadris
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.
9 years ago
korhadris
0ec6eab683
Appending ".$justDomainsExtension" to $saveLocation variable.
...
Every use of $saveLocation was adding this and making lines
longer.
9 years ago
korhadris
159b29b80b
Replace spaces with tabs to make indentation consistent within the file.
9 years ago
Fourdee
9d99a4ef36
Patch 3 - Dont use /etc/hosts
...
/etc/pihole/gravity.list now stores the block list. Ensures the
/etc/hosts file is left untouched.
9 years ago
jacobsalmela
563db80b6d
resolves #25
...
Will not count blank lines if they happen to exist.
9 years ago
jacobsalmela
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
9 years ago
rmceoin
f6ccb4b658
Merge remote-tracking branch 'upstream/master'
9 years ago