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
1,393 Commits 8 Branches 109 Tags 31 MiB
Commit Graph

303 Commits

Author SHA1 Message Date
Adam Warner d6fe48112c Merge pull request #857 from pi-hole/feature/debugUpdate 
Debug Updates
 2016-10-29 23:15:07 +01:00
Dan Schaper dcf6e6b14d Clarify user action required to end the scripts. 2016-10-29 12:24:22 -07:00
Dan Schaper 908697a963 User token instructions, and small bugfix for missing separator. 2016-10-29 12:04:18 -07:00
Dan Schaper fad2d6b1d1 Return values start showin up now. Logic operators too... 2016-10-28 15:53:18 -07:00
Dan Schaper 9cd830b6aa Start to refine tests and clean up code. 2016-10-28 15:37:45 -07:00
Dan Schaper d9a16b0ff4 Clear up bottom half of script with fewer redundenicies. 2016-10-28 15:25:06 -07:00
Dan Schaper cb5c94ef5e Sorry, left that gravity.list parser in. Big debug files. Cleared that up. 2016-10-28 15:13:04 -07:00
Dan Schaper 85fbd66871 Good commit point, number of changes 2016-10-28 14:52:08 -07:00
Eric Warnke 3da75d6125 Grep was leaking a file not found if blacklist didn't exist 2016-10-28 17:28:04 -04:00
Dan Schaper d4a3a5c180 Trying to implement The Brontide Idiom for design. 2016-10-28 10:42:30 -07:00
Dan Schaper 71e3a473d6 Fix = underbar 2016-10-28 07:16:16 -07:00
Dan Schaper c2cfc09f63 Clean up more of the UX and log. Lots to go. 2016-10-28 07:06:05 -07:00
Dan Schaper 01f10b56e8 Refactor out some more reudndant code. 2016-10-28 06:51:30 -07:00
Dan Schaper 90ec0a610e Tricorder is introduced. 2016-10-28 04:42:45 -07:00
Dan Schaper 42bff1ce1b Move parse utility to be near other parsing functions. 2016-10-28 03:53:53 -07:00
Dan Schaper e3c7a1f31f Top half user output updated. 2016-10-28 03:49:03 -07:00
Dan Schaper 0debbffa70 Add a couple of parsing utility functions. 2016-10-28 03:45:07 -07:00
Jacob Salmela 473b58d26d Merge pull request #704 from stonedbovines/development 
lighttpd.conf templates change
 2016-10-27 20:22:46 -05:00
Dan Schaper 300001e766 Remove `listen-address` directive 
Since we declare an `interface` `dnsmasq` should ignore the `listen-address` directive thus making redundant. Removed.
 2016-10-27 11:56:16 -07:00
Adam Warner 21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution 
[BugFix] A man has no name resolution
 2016-10-27 19:41:07 +01:00
Dan Schaper f9570a82cc Remove glitchy daemon detection. 2016-10-27 00:58:24 -07:00
Dan Schaper 36285ead57 Just becuase this is bugging me, but I'll fix it later. 2016-10-27 00:32:18 -07:00
Dan Schaper 13e488dace Daemon check for lighttpd and dnsmasq. 2016-10-27 00:30:51 -07:00
Dan Schaper f169da8fd0 Set for quiet temporarily. 2016-10-26 14:48:11 -07:00
Dan Schaper 60741298b7 Cut more verbosity. Prep for `lsof` parsing and daemon tests. 2016-10-26 14:33:47 -07:00
Dan Schaper f73734acb0 Only check IPv6 Gateway if it exists. 2016-10-26 13:57:57 -07:00
Dan Schaper fc360abe43 Only check IPv6 if system is enabled. 2016-10-26 12:22:20 -07:00
Adam Warner 3996e11425 Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist 
Improvements to White and Blacklists
 2016-10-26 19:52:16 +01:00
Dan Schaper 98db002770 Tighten IP test reponse to user. 2016-10-26 11:38:19 -07:00
Eric Warnke f1c1caf7bd url.rewrite does not work in $HTTP block lighttpd bug #2526 2016-10-26 11:49:42 -04:00
Eric Warnke e2997b8135 Due to lighttpd bug 2526 the url.rewrite for javascript must be placed 
outside of the $HTTP block or it will never evaluate.
 2016-10-26 11:49:31 -04:00
Adam Warner 0d6a6b97f9 remove whitelist and blacklist scripts 2016-10-26 09:56:45 +01:00
Adam Warner 469ff45f01 create list.sh. Combines whitelist and blacklist scripts in an effort to reduce code duplication. 
update pihole script to reflect new white/blacklist command.
 2016-10-26 09:36:02 +01:00
Dan Schaper 4269626f5d Attribute source for bashism. 2016-10-25 21:53:41 -07:00
Dan Schaper 8fa897aadb Add back in sourcing files (setupVars.conf) and tweak `ip_check` 2016-10-25 21:39:28 -07:00
Dan Schaper f549618d12 Move environment IPv6 interface check to `ip_check` and fix IPv6 source routing issue. 2016-10-25 21:25:57 -07:00
Dan Schaper 2fa47aaf31 Source routing is deprecated by RFC5095 2016-10-25 20:53:18 -07:00
Dan Schaper b0874fb23a Temporarily get rid of gateway sourcing from setupVars, temporarily. 2016-10-25 19:53:00 -07:00
Dan Schaper fb70fd77e8 Prototype version_check, add helper functions for logging and echo. 2016-10-25 17:50:14 -07:00
Dan Schaper 01f17f9cbb Reduce header verbosity. New header writer. 2016-10-25 17:19:33 -07:00
Adam Warner 18005ceee8 add hostname lines in 01-pihole.conf 2016-10-25 15:03:49 +01:00
Adam Warner eb52f81a5c add pi.hole entries to 01-pihole.conf 2016-10-25 14:54:10 +01:00
Adam Warner aba0d93fda Merge pull request #814 from pi-hole/promoTweaksTheSecond 
Various tweaks and fixes: Part 2 (Plus Pause/Resume button functionality!)
 2016-10-25 17:43:40 +06:00
Promofaux b49384ffe4 intent 2016-10-23 22:44:21 +01:00
Promofaux 7fb622638b flip reload logic. Do not reload if there are not changes made to blacklist.txt 2016-10-23 22:44:06 +01:00
Promofaux bd0cc134bf MERGE FAIL :ashamed_face: 2016-10-23 22:43:11 +01:00
Promofaux 476fd1f695 indentation 2016-10-23 22:38:18 +01:00
Promofaux 96053d13be Flip reload logic. Do not reload lists if no changes made to whitelist.txt 2016-10-23 22:38:06 +01:00
Promofaux c958bed418 Consistency changes. Replace MOST uses of `echo >> ${DebugLog}` with usage of `log_write` function 2016-10-23 22:31:20 +01:00
Promofaux 2b2c240d39 Fix shebang line broken in #831 
Remove root check and references to ${SUDO}

Check for /etc/pihole/setupVars.conf and use piholeInterace in IPv6 checks as suggest by @jacobsalmela https://github.com/pi-hole/pi-hole/pull/831#issuecomment-255606854
 2016-10-23 22:15:10 +01:00