arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-18 14:18:15 +00:00
Code Issues Releases Wiki Activity
2,121 Commits 8 Branches 109 Tags 19 MiB
543f1243e2
Commit Graph

212 Commits

Author SHA1 Message Date
Promofaux
8cb72d87e4 make IPv4/IPv6 checking more robust in gravity 2016-10-19 19:50:21 +01:00
Promofaux
49f48e2aaa wrong word. #admincrimes 2016-10-17 22:24:59 +01:00
Promofaux
8c0f860601 Use systemctl/service calls instead of killall to restart/reload dnsmasq 2016-10-16 17:16:59 +01:00
Promofaux
7ee1110351 ugh. pihole.conf. 2016-10-15 20:09:38 +01:00
Promofaux
51c4c51d9e Add trap to check existence of setupVars 2016-10-15 20:03:33 +01:00
Promofaux
fc4fe54099 standardise function naming 2016-10-15 20:02:57 +01:00
Promofaux
4c42f00a86 remove uses of ${SUDO} and root check from gravity. As this is handled by pihole command. 2016-10-15 18:42:53 +01:00
Promofaux
4f35aac6dd transpose $ and " 2016-10-10 22:32:30 +01:00
Dan Schaper
4418ca9e9f Missing quote replacement. 2016-10-10 11:41:29 -07:00
Dan Schaper
07b7e8a1a6 Track down a couple more variable name changes. 2016-10-10 06:33:56 -07:00
Dan Schaper
7ae2fc37c0 Match up descriptive variable names with setupVars.conf. Rectifies Ubuntu 16.04 gravity.list bug. 2016-10-10 06:23:17 -07:00
Adam Warner
ac49e639bd Fix #718 2016-09-26 11:58:07 +01:00
bcambl
21d4199a38 Merge branch 'development' into dns-hostname-fixes 2016-09-19 17:33:32 -06:00
Promofaux
3ed62d45f5 Source IP addresses from /etc/pihole/setupVars.conf 2016-09-16 23:05:08 +01:00
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
 2016-09-07 21:16:52 -06:00
Promofaux
6796b8bdad pass argument from pihole command to gravity for -f check 2016-08-19 23:06:56 +01:00
Promofaux
475d016029 hmmm 2016-08-19 22:52:55 +01:00
Promofaux
201304e678 fix variables in gravity to stop it using -f wether it's set or not 2016-08-19 22:51:09 +01:00
Promofaux
f6ac0d73b4 Add force delete option 2016-08-17 19:08:55 +01:00
Promofaux
ae47be0ce9 Add HelpFunc 2016-08-17 18:59:00 +01:00
Dan Schaper
024b741552 Merge pull request #490 from bcambl/fedora-armhf7 
Fedora Support
 2016-06-29 14:25:23 -07:00
Mcat12
4e95f4678f Merge pull request #540 from pi-hole/bugfix/curl-redirect 
Have `curl` auto-redirect
 2016-06-26 13:42:40 -04:00
Dan Schaper
7670b4e380 Mahakala User Agen modernization 
Update Curl User Agent for Maha list.
 2016-06-25 06:00:49 -07:00
Dan Schaper
636a9123b8 Have curl auto-redirect 
This should solve the redirection issue if a list is moved.
 2016-06-23 18:37:45 -07:00
bcambl
27a9642090 check for sudo via 'command -v' instead of dkpg-query 2016-06-11 15:58:49 -06:00
Jim Liu
08e95ed606 Update gravity.sh 
Change piholeIPfile to a permanent location.
 2016-04-22 01:40:42 +08:00
Jim Liu
a5ad48aa18 Update gravity.sh 2016-04-21 23:40:44 +08:00
Promofaux
ad574f5e90 Replace kill with killall 2016-04-16 15:52:38 +01:00
Promofaux
4941a657bf remove -s switch, as it turns out it worked afterall. 2016-04-16 12:59:40 +01:00
Promofaux
3d4bff9414 Add -s switch to kill command to increase compatability 2016-04-16 10:56:49 +01:00
Adam Warner
99a5b3a98a remove all mentions of spinner 2016-04-11 11:29:14 +01:00
Promofaux
8514f42d0d Correct variable name (Missing capital letter! whoops!) 2016-04-05 08:53:52 +01:00
Promofaux
0c0dd914f7 Fix source lists not being skipped if they are already up to date 2016-04-04 23:48:34 +01:00
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 2016-04-04 23:38:46 +01:00
nate
5347ee4896 Write verbose status of processes to debug log & Minor UI Fixes 2016-04-04 00:59:24 -05:00
Promofaux
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
Promofaux
0e6e8040ba Change spinstr to match install and uninstall scripts 2016-04-03 21:54:16 +01:00
nate
767b72fbfa Merged branch development into PiHoleController 2016-04-02 17:34:41 -05:00
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
 2016-04-01 20:19:47 -04:00
nate
bb66d559e7 Merge branch 'development' 
Conflicts:
	gravity.sh
 2016-04-01 11:08:46 -05:00
nate
7b8fa3b922 Permissions changed for /etc/pihole and cleaned up some output 2016-04-01 01:11:59 -05:00
nate
28f2a1309e Merge branch 'development' 
Conflicts:
	automated install/uninstall.sh
 2016-03-31 20:25:54 -05:00
nate
45f24c8a85 Readded cats that were originally considered UUOC 2016-03-30 19:56:11 -05:00
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
 2016-03-29 12:57:22 -05:00
Nate
31fc2bfeb7 Modified gravity.sh to point to new file locations and fixed permission issue 2016-03-29 00:25:40 -05:00
nate
37c1999965 Merged branch ScriptCleanup-Dev into development 2016-03-28 18:46:08 -05:00
nate
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
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
 2016-03-28 18:44:54 -05:00
nate
f2150ee7e1 Merge conflict resolution 2016-03-28 13:07:51 -05:00
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
 2016-03-28 12:58:44 -05:00
nate
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
nate
0b9e78df2c Cleaned code and added prompt for purge on uninstall 2016-03-26 16:57:01 -05:00
Carter Maxwell
e4ddf8bc33 remove trailing whitespace gravity.sh 2016-03-05 21:13:43 -08:00
Adam Warner
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
Promofaux
bffc77e478 Add support for comments and blank lines in adlists.default/adlists.list 2016-02-21 17:45:25 +00:00
Adam Warner
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
Adam Warner
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
Mcat12
af360a1a20 Merge pull request #298 from fayetted/Issue_297 
Fixes gravity_transport variable interpretation.
 2016-02-10 20:10:05 -05:00
Daniel Fayette
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
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.
 2016-02-09 19:51:03 -06:00
Promofaux
5111880edf remove erroneous -o 2016-01-27 22:35:52 +00:00
Promofaux
b75b290351 adlists.default copied on each run of gravity. In case it has been overwritten 2016-01-27 21:14:23 +00:00
Promofaux
352ebc3193 outsource list of adlists to a file in /etc/pihole/. 2016-01-26 20:26:09 +00:00
Adam Warner
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
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! 2016-01-25 15:52:22 +00:00
Promofaux
6b76270889 Remove spinner call when adding URLs of adlist to array.. seems to break it. 2016-01-24 22:30:12 +00:00
Promofaux
cebdcc71a7 Add $SUDO call to spinner() in gravity.sh 2016-01-24 21:27:25 +00:00
Promofaux
39507b9d0d Added echo ':::' to the top of the file 2016-01-24 16:47:38 +00:00
Promofaux
a539dc41f3 Tidy up gravity output to match install script 2016-01-24 15:25:24 +00:00
Leo
8b18fdd322 Update gravity.sh 2016-01-21 17:19:09 -05:00
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)
 2016-01-21 17:14:55 -05:00
Adam Warner
5d842a7533 Merging 2016-01-15 18:45:12 +00:00
Adam Warner
2284a27814 Consumes blacklist.sh now, too. 2016-01-15 15:54:11 +00:00
Adam Warner
cc62d984d2 Changed whitelist function to outsource to whitelist.sh 2016-01-15 14:49:16 +00:00
jacobsalmela
ca5e34a9a9 Merge branch 'master' into whitelist 
# Conflicts:
#	gravity.sh
 2016-01-14 18:12:45 -06:00
Jacob Salmela
3fc1817e7a Merge branch 'master' into ipv6 2016-01-01 18:34:33 -06:00
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)
 2016-01-01 14:11:46 +00:00
Salmela
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
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
Jacob Salmela
c88982d0d5 chmod doesn't apply at initial install 2015-12-09 15:52:53 -06: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