Adam Warner
e0ac109dd1
remove hostname insertion into gravity.list from gravity.sh
8 years ago
Adam Warner
7653b3d088
Remove pi.hole references in gravity.sh
8 years ago
Promofaux
d0826b2c33
Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
8 years ago
Marcus Hildum
ebbe1fc236
More consistency
...
Odd mix of variables quoted with and without no-op parameter expansion
(i.e. ${thing})
More ${thing} than not, make that the standard
8 years ago
Marcus Hildum
aac8e45397
Imbue gravity.sh with some consistency
...
Mish-mash of tabs and spaces used for indentation. Mostly tabs though,
so going with those. Also indenting blocks and enforcing the
loop statement; do
done
style over the newline for do since it seemed to be more common.
8 years ago
Adam Warner
8f9ff930b3
Merge pull request #823 from tuplink/EnableOrDisable
...
Enable or disable
8 years ago
Promofaux
9ab6df0e54
Merge branch 'development' into promoTweaksTheSecond
...
# Conflicts:
# advanced/Scripts/blacklist.sh
# advanced/Scripts/whitelist.sh
8 years ago
Tommy Huff
15d68467a1
attempt to fix
8 years ago
Tommy Huff
3b6ecc573e
fix conflict
...
Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable
8 years ago
Tommy Huff
3ca3eaa62c
change restartdnsmasq to restartdns
8 years ago
Tommy Huff
dda448e050
use finction in pihole to restart dnsmasq
8 years ago
Tommy Huff
60873144ea
make last line of script return a new line been bugging me for awhile
8 years ago
Tommy Huff
a9d17c96be
include status at end of gravity so if it is disabled you will see it when running
8 years ago
Tommy Huff
7d7e17b351
add toggle to enable or disable pi-hole
8 years ago
Adam Warner
c71a976e76
kill off an old ugly hack
8 years ago
Marcus Hildum
0efda04920
Use heredocs instead of multiple calls to echo
...
There were a lot of places (like in help functions) that used multiple
echo calls instead of heredocs. Personal opinion but this seems cleaner.
8 years ago
Marcus Hildum
28eeaf201b
Standardize function declaration
...
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical
myfucn() {
}
style.
8 years ago
Promofaux
9aa38cf0ae
mv patternbuffer instead of cp, then no need to clean up
8 years ago
Promofaux
a7fa7466fb
remove no longer needed code
8 years ago
Promofaux
3f73c61cee
cache event horizon before white/blacklists are applied for quicker processing on white/blacklist calls of gravity
8 years ago
Promofaux
b88fe572fe
Whitelist/Blacklist domains directly in the Event Horizon.
8 years ago
Promofaux
59ba6f8aec
add flag to skip download of lists
8 years ago
Promofaux
25343da6b7
wrong variable name
8 years ago
Promofaux
60d17b97f5
spacing
8 years ago
Promofaux
8cb72d87e4
make IPv4/IPv6 checking more robust in gravity
8 years ago
Promofaux
49f48e2aaa
wrong word. #admincrimes
8 years ago
Promofaux
8c0f860601
Use systemctl/service calls instead of killall to restart/reload dnsmasq
8 years ago
Promofaux
7ee1110351
ugh. pihole.conf.
8 years ago
Promofaux
51c4c51d9e
Add trap to check existence of setupVars
8 years ago
Promofaux
fc4fe54099
standardise function naming
8 years ago
Promofaux
4c42f00a86
remove uses of ${SUDO} and root check from gravity. As this is handled by `pihole` command.
8 years ago
Promofaux
4f35aac6dd
transpose `$` and `"`
8 years ago
Dan Schaper
4418ca9e9f
Missing quote replacement.
8 years ago
Dan Schaper
07b7e8a1a6
Track down a couple more variable name changes.
8 years ago
Dan Schaper
7ae2fc37c0
Match up descriptive variable names with `setupVars.conf`. Rectifies Ubuntu 16.04 `gravity.list` bug.
8 years ago
Adam Warner
ac49e639bd
Fix #718
8 years ago
bcambl
21d4199a38
Merge branch 'development' into dns-hostname-fixes
8 years ago
Promofaux
3ed62d45f5
Source IP addresses from /etc/pihole/setupVars.conf
8 years ago
bcambl
640af300cb
additional hostname checks in gravity.sh
...
- Test if /etc/hostname exists before attempting to cat the file.
- Add alternative hostname discovery via hostname command
- Add an error message to stdout if unable to determine host fqdn
8 years ago
Promofaux
6796b8bdad
pass argument from pihole command to gravity for -f check
8 years ago
Promofaux
475d016029
hmmm
8 years ago
Promofaux
201304e678
fix variables in gravity to stop it using -f wether it's set or not
8 years ago
Promofaux
f6ac0d73b4
Add force delete option
8 years ago
Promofaux
ae47be0ce9
Add HelpFunc
8 years ago
Dan Schaper
024b741552
Merge pull request #490 from bcambl/fedora-armhf7
...
Fedora Support
8 years ago
Mcat12
4e95f4678f
Merge pull request #540 from pi-hole/bugfix/curl-redirect
...
Have `curl` auto-redirect
8 years ago
Dan Schaper
7670b4e380
Mahakala User Agen modernization
...
Update Curl User Agent for Maha list.
8 years ago
Dan Schaper
636a9123b8
Have `curl` auto-redirect
...
This should solve the redirection issue if a list is moved.
8 years ago
bcambl
27a9642090
check for sudo via 'command -v' instead of dkpg-query
8 years ago
Jim Liu
08e95ed606
Update gravity.sh
...
Change piholeIPfile to a permanent location.
9 years ago
Jim Liu
a5ad48aa18
Update gravity.sh
9 years ago
Promofaux
ad574f5e90
Replace kill with killall
9 years ago
Promofaux
4941a657bf
remove -s switch, as it turns out it worked afterall.
9 years ago
Promofaux
3d4bff9414
Add -s switch to kill command to increase compatability
9 years ago
Adam Warner
99a5b3a98a
remove all mentions of spinner
9 years ago
Promofaux
8514f42d0d
Correct variable name (Missing capital letter! whoops!)
9 years ago
Promofaux
0c0dd914f7
Fix source lists not being skipped if they are already up to date
9 years ago
Promofaux
c6405bc93b
Ensure addn-hosts value is updated in /etc/dnsmasq.d/01-pihole.conf if user has a custom value set in pihole.conf
9 years ago
nate
5347ee4896
Write verbose status of processes to debug log & Minor UI Fixes
9 years ago
Promofaux
d710b97276
Fix issue raised in #421 (Use variable instead of hardcoded path, do not delete user created pihole.conf!)
9 years ago
Promofaux
0e6e8040ba
Change spinstr to match install and uninstall scripts
9 years ago
nate
767b72fbfa
Merged branch development into PiHoleController
9 years ago
Mcat12
0fbf72bb09
Change dummy domain and show device's hostname in ping
...
* Change dummy domain
Allows users to access Pi-hole console with my.pi-hole.net instead of the IP address
* Cleaned up formatting
* Put device hostname at the top of the list
Changed my.pi-hole.net to pi.hole and placed it under the device hostname. This way, ping will return the device hostname but you still can access the web interface with pi.hole/admin
9 years ago
nate
bb66d559e7
Merge branch 'development'
...
Conflicts:
gravity.sh
9 years ago
nate
7b8fa3b922
Permissions changed for /etc/pihole and cleaned up some output
9 years ago
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
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