moparisthebest
/
pi-hole
mirror of https://github.com/moparisthebest/pi-hole
1
0
Fork 0
Code Issues Releases Wiki Activity
302 Commits 13 Branches 3 Tags 655 KiB
Commit Graph

302 Commits

Author SHA1 Message Date
Jacob Salmela fd9b34ad9b Merge branch 'master' into pr/118 
# Conflicts:
#	automated install/basic-install.sh
 2015-12-06 16:21:45 -06:00
Dan Schaper 412a190b42 Basic-install.sh should only show one ip address in whiptail screen. 2015-12-06 11:05:09 -08:00
Dan Schaper 7cf5320f50 Only write to dhcpcd.conf if address isn't set 2015-12-06 02:40:30 -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 f453d407a9 log-async 
For better performance.  I have been using it for a few weeks with no
adverse effects.
 2015-12-05 14:14:34 -06:00
Jacob Salmela 49a40115c8 fixes #105 2015-12-05 14:04:37 -06:00
Dan Schaper f7f2895eec Merge pull request #2 from jacobsalmela/master 
Upstream sync
 2015-12-04 20:26:50 -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 0a5c3d021a Merge pull request #110 from dschaper/patch-2 
ReadMe.md point to wiki
 2015-12-04 15:08:17 -06:00
Dan Schaper 861673594d Point to wiki 
Point users to the Wiki Customization entry instead of the PR
 2015-12-03 13:17:27 -08:00
Jacob Salmela b806a36cfc Merge pull request #106 from dschaper/documenting 
Document dnsmasq.conf config
 2015-12-03 10:23:44 -06:00
Dan Schaper 2193d6a81f Document dnsmasq.conf config 2015-12-03 01:29:26 -08:00
Jacob Salmela 9ee2f006ac Merge pull request #102 from jacobsalmela/lighttpd 
Fix #101 and add Logstalgia requirements
 2015-12-01 20:10:21 -06:00
Jacob Salmela c34cc1608b for use with logstalgia 
This seems to show the domain queried and the path requested.
 2015-12-01 16:04:07 -06:00
Jacob Salmela 1eb7f879f0 fixes #101 
the line url.access-deny caused the error.
 2015-12-01 15:12:16 -06:00
Jacob Salmela 6c4f4f49bd Merge branch 'master' into lighttpd 2015-12-01 15:09:51 -06:00
Jacob Salmela 831322b8b2 replace file paths with variables 2015-11-27 18:38:33 -06:00
Jacob Salmela 573c1ef94f double bracket notation 2015-11-27 18:34:02 -06:00
Jacob Salmela a2cddda590 if whitelist.txt doesn't exist, create it 2015-11-27 18:29:44 -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 f899aaad44 Merge branch 'jacobsalmela-development' into bug/CleanupFiles 2015-11-25 19:30:09 -08:00
Dan Schaper 7bbe56d61c Fix merge conflict 2015-11-25 19:29:13 -08:00
Jacob Salmela 8ad69cea33 Merge pull request #85 from dschaper/development 
Refactored gravity.sh
 2015-11-25 20:14:30 -06:00
Jacob Salmela 11e1859f7d Merge pull request #92 from dschaper/OutsideIP 
IP detection update for gravity.sh
 2015-11-25 19:05:56 -06:00
Dan Schaper 23856d65e2 IP address detection update 2015-11-25 16:35:36 -08:00
Jacob Salmela bc0a8e7733 final dialog verbiage 
Updating dialog to reflect changes in #90
 2015-11-25 18:08:17 -06:00
Dan Schaper 2164e13303 Merge pull request #11 from dschaper/upstream 
Pull upstream into master
 2015-11-25 16:07:54 -08:00
Dan Schaper 3f4567d088 Merge pull request #10 from jacobsalmela/master 
Upstream sync
 2015-11-25 16:06:48 -08:00
Jacob Salmela bf4ef2b314 Merge pull request #90 from dschaper/IPCheck 
Pull IP info from outgoing interface
 2015-11-25 18:02:09 -06:00
Dan Schaper b011fe28d9 No longer need a reboot 2015-11-25 14:34:06 -08:00
Dan Schaper b318d5350c Merge branch 'IPCheck' of https://github.com/dschaper/pi-hole into IPCheck 2015-11-25 14:24:15 -08:00
Dan Schaper 21ee63b7fb Get IP info from outgoing interface 
Use IP to get interface information from outgoing interface. Use CIDR notation to make things easier.
 2015-11-25 14:08:13 -08:00
Dan Schaper 4057a076a2 Merge pull request #9 from dschaper/upstream 
Upstream sync
 2015-11-25 14:03:25 -08:00
Dan Schaper 6e13134328 Revert FHS change until merged 2015-11-25 13:55:32 -08:00
Dan Schaper 29ae66c6db Check IP info for outgoing interface 2015-11-25 13:43:59 -08:00
Jacob Salmela 464003d674 uninstall script 
This should remove the Pi-hole.
 2015-11-25 13:36:39 -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
Jacob Salmela ecb514dd0a pihole in the cloud link 2015-11-25 13:36:39 -08:00
Jacob Salmela 04f6c478cc Updated install instructions 
Also a screenshot of the dialog-based installer
 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 100cbd4032 Merge pull request #7 from dschaper/upstream 
Upstream
 2015-11-23 04:56:40 -08:00
Dan Schaper 673113cb98 Merge pull request #6 from jacobsalmela/master 
Upstream sync
 2015-11-23 04:55:57 -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