4e95f4678f
Merge pull request #540 from pi-hole/bugfix/curl-redirect
...
Have `curl` auto-redirect
2016-06-26 13:42:40 -04:00
7670b4e380
Mahakala User Agen modernization
...
Update Curl User Agent for Maha list.
2016-06-25 06:00:49 -07:00
636a9123b8
Have `curl` auto-redirect
...
This should solve the redirection issue if a list is moved.
2016-06-23 18:37:45 -07:00
27a9642090
check for sudo via 'command -v' instead of dkpg-query
2016-06-11 15:58:49 -06:00
08e95ed606
Update gravity.sh
...
Change piholeIPfile to a permanent location.
2016-04-22 01:40:42 +08:00
a5ad48aa18
Update gravity.sh
2016-04-21 23:40:44 +08:00
ad574f5e90
Replace kill with killall
2016-04-16 15:52:38 +01:00
4941a657bf
remove -s switch, as it turns out it worked afterall.
2016-04-16 12:59:40 +01:00
3d4bff9414
Add -s switch to kill command to increase compatability
2016-04-16 10:56:49 +01:00
99a5b3a98a
remove all mentions of spinner
2016-04-11 11:29:14 +01:00
8514f42d0d
Correct variable name (Missing capital letter! whoops!)
2016-04-05 08:53:52 +01:00
0c0dd914f7
Fix source lists not being skipped if they are already up to date
2016-04-04 23:48:34 +01:00
c6405bc93b
Ensure addn-hosts value is updated in /etc/dnsmasq.d/01-pihole.conf if user has a custom value set in pihole.conf
2016-04-04 23:38:46 +01:00
5347ee4896
Write verbose status of processes to debug log & Minor UI Fixes
2016-04-04 00:59:24 -05:00
d710b97276
Fix issue raised in #421 (Use variable instead of hardcoded path, do not delete user created pihole.conf!)
2016-04-03 22:10:04 +01:00
0e6e8040ba
Change spinstr to match install and uninstall scripts
2016-04-03 21:54:16 +01:00
767b72fbfa
Merged branch development into PiHoleController
2016-04-02 17:34:41 -05:00
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
2016-04-01 20:19:47 -04:00
bb66d559e7
Merge branch 'development'
...
Conflicts:
gravity.sh
2016-04-01 11:08:46 -05:00
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
Mcat12
Dan Schaper
bcambl
Jim Liu
Promofaux
Adam Warner
nate
Carter Maxwell
Adam Warner
Daniel Fayette
Adam Warner
Leo
jacobsalmela
Jacob Salmela
Clinton
klaas01
Dan Schaper
Cole Turner
Sven Giermann