nate
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
9 years ago
nate
45f24c8a85
Readded `cat`s that were originally considered UUOC
9 years ago
nate
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
9 years ago
Nate
31fc2bfeb7
Modified gravity.sh to point to new file locations and fixed permission issue
9 years ago
nate
37c1999965
Merged branch ScriptCleanup-Dev into development
9 years ago
nate
86dd4dd784
New spinner for gravity.sh
...
Spinner in gravity.sh now matches basic-install.sh and uninstall.sh
9 years ago
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