tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
739 Commits 11 Branches 110 Tags 33 MiB
Commit Graph

125 Commits

Author SHA1 Message Date
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 `cat`s 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