Commit graph

  • 55a653aca4 clear out /opt/pihole folder before installing scripts Adam Warner 2016-10-26 10:00:00 +0100
  • 0d6a6b97f9 remove whitelist and blacklist scripts Adam Warner 2016-10-26 09:56:45 +0100
  • 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. Adam Warner 2016-10-26 09:36:02 +0100
  • bc077acfb8 Merge pull request #853 from pi-hole/gravFix Dan Schaper 2016-10-25 21:57:47 -0700
  • 4269626f5d Attribute source for bashism. Dan Schaper 2016-10-25 21:53:41 -0700
  • 8fa897aadb Add back in sourcing files (setupVars.conf) and tweak ip_check Dan Schaper 2016-10-25 21:39:28 -0700
  • f549618d12 Move environment IPv6 interface check to ip_check and fix IPv6 source routing issue. Dan Schaper 2016-10-25 21:25:57 -0700
  • 2fa47aaf31 Source routing is deprecated by RFC5095 Dan Schaper 2016-10-25 20:53:18 -0700
  • b0874fb23a Temporarily get rid of gateway sourcing from setupVars, temporarily. Dan Schaper 2016-10-25 19:53:00 -0700
  • 877ebb3d56 Alpha support for Alpine linux, all the fun, half the size Eric Warnke 2016-10-25 21:07:30 -0400
  • fb70fd77e8 Prototype version_check, add helper functions for logging and echo. Dan Schaper 2016-10-25 17:50:14 -0700
  • 01f17f9cbb Reduce header verbosity. New header writer. Dan Schaper 2016-10-25 17:19:33 -0700
  • f8e2263f72 Remove JQ / it shouldnt have been left there as it was not needed Tommy Huff 2016-10-25 19:13:49 -0400
  • 9bba4c57ef add jq to install script Tommy Huff 2016-10-25 19:09:07 -0400
  • f6d514235d Last fixes Eric Warnke 2016-10-25 19:04:15 -0400
  • 56bbf3b05c Parse with PHP Tommy Huff 2016-10-25 18:55:23 -0400
  • 48faf1aa96 Parse JSON with jq Tommy Huff 2016-10-25 18:45:45 -0400
  • 189c87dfb5 Use Python to parse JSON Tommy Huff 2016-10-25 18:41:02 -0400
  • 4c853defb2 add if traps to check for existence of whitelist.txt / blacklist.txt Promofaux 2016-10-25 22:27:35 +0100
  • 0fde38176e More cleanup for rpm based systems including dependacies and remove iptables firewall since it won't stay between reboots Eric Warnke 2016-10-25 15:49:57 -0400
  • 898f50d8a8 url.rewrite does not work in $HTTP block lighttpd bug #2526 Eric Warnke 2016-10-25 14:48:32 -0400
  • 13f4fc3b25 Due to lighttpd bug 2526 the url.rewrite for javascript must be placed outside of the $HTTP block or it will never evaluate. Eric Warnke 2016-10-25 14:46:26 -0400
  • bad8b293cf Fix install for debian7, now exhibits the same issue as ubnuntu 14.04 not returning the expected js payload Eric Warnke 2016-10-25 12:11:32 -0400
  • bd0db56ba0 actually fix up logic Adam Warner 2016-10-25 15:29:02 +0100
  • 95f0b3710d fix up logic Adam Warner 2016-10-25 15:27:13 +0100
  • 38a1b0c05b Merge branch 'development' of https://github.com/pi-hole/pi-hole into development Eric Warnke 2016-10-25 10:09:00 -0400
  • e0ac109dd1 remove hostname insertion into gravity.list from gravity.sh Adam Warner 2016-10-25 15:07:29 +0100
  • 86349527e7 replace HOSTNAME tokens in 01-pihole.conf Adam Warner 2016-10-25 15:06:37 +0100
  • 18005ceee8 add hostname lines in 01-pihole.conf Adam Warner 2016-10-25 15:03:49 +0100
  • 7653b3d088 Remove pi.hole references in gravity.sh Adam Warner 2016-10-25 15:01:16 +0100
  • 911053f63f Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution. Adam Warner 2016-10-25 15:00:18 +0100
  • eb52f81a5c add pi.hole entries to 01-pihole.conf Adam Warner 2016-10-25 14:54:10 +0100
  • 8adeb4c930 Merge 40fdaea099 into 4839953328 tuplink 2016-10-25 12:52:36 +0000
  • 4839953328 Merge pull request #844 from pi-hole/EnforceTemplate Adam Warner 2016-10-25 17:57:06 +0600
  • aba0d93fda Merge pull request #814 from pi-hole/promoTweaksTheSecond Adam Warner 2016-10-25 17:43:40 +0600
  • 0de74c0448 Merge pull request #848 from pi-hole/PromoFaux-patch-1 v2.9.4a Adam Warner 2016-10-25 17:38:04 +0600
  • ee927346b7 Update .pullapprove.yml Adam Warner 2016-10-25 12:36:05 +0100
  • bbc23eecd7 Merge e4405fbe2a into fc89851ce9 Adam Warner 2016-10-25 08:27:51 +0000
  • e4405fbe2a Update .pullapprove.yml to V2 Adam Warner 2016-10-25 09:27:22 +0100
  • 24bc3fafd9 merge fix2 Eric Warnke 2016-10-24 23:27:57 -0400
  • acbdea8bd5 merge fix Eric Warnke 2016-10-24 23:24:55 -0400
  • 6c1df57965 Make installer work on centos 6 and warn that web ui is broken Eric Warnke 2016-10-24 22:31:15 -0400
  • e36ff00227 Make installer work on centos 6 and warn that web ui is broken Eric Warnke 2016-10-24 22:28:32 -0400
  • 40fdaea099 back to python works with 2 and 3 Tommy Huff 2016-10-24 20:52:08 -0400
  • 33285d8d8c try with jq Tommy Huff 2016-10-24 19:49:55 -0400
  • 5894a0e9c5 add python dependencie Tommy Huff 2016-10-24 17:53:07 -0400
  • 2f8015cbca Update PULL_REQUEST_TEMPLATE.md Dan Schaper 2016-10-24 14:50:47 -0700
  • f3bf7c4b38 Update ISSUE_TEMPLATE.md Dan Schaper 2016-10-24 14:48:38 -0700
  • e9f14da1b4 Merge branch 'development' of https://github.com/pi-hole/pi-hole into development / update chro Tommy Huff 2016-10-24 17:46:38 -0400
  • 99c3c57968 update chronometer Tommy Huff 2016-10-24 17:41:14 -0400
  • e37c4d57da Merge pull request #842 from pi-hole/Fix/template-spacing Adam Warner 2016-10-25 02:32:34 +0600
  • acff90c000 fix check box spacing Jacob Salmela 2016-10-24 14:58:13 -0500
  • 5f9e72dd71 Merge pull request #835 from pi-hole/debugFixes Adam Warner 2016-10-24 19:40:27 +0600
  • be0bcb8f7d Merge pull request #838 from airencracken/hotfix-missing-newline Adam Warner 2016-10-24 15:48:53 +0600
  • 44c3d56439 Merge pull request #836 from pi-hole/UdemyAttribution Adam Warner 2016-10-24 13:54:14 +0600
  • d106bf3b04 update to break out functions and not require json to be passed to them Tommy Huff 2016-10-23 23:46:33 -0400
  • 3b4bdaf052 add python dep Tommy Huff 2016-10-23 21:34:25 -0400
  • 4ec3d1ea72 update to pull JSON from web API Tommy Huff 2016-10-23 21:32:23 -0400
  • 519d731ddd Fix missing newline Marcus Hildum 2016-10-23 16:45:51 -0700
  • 119c00c22a Merge pull request #837 from pi-hole/UdemyAttribution-1 Dan Schaper 2016-10-23 15:53:27 -0700
  • 12596dd697 Update PULL_REQUEST_TEMPLATE.md Dan Schaper 2016-10-23 15:50:59 -0700
  • cb38f5f0d7 Move attribution to bottom since our bots quote from top Dan Schaper 2016-10-23 15:50:03 -0700
  • b49384ffe4 intent Promofaux 2016-10-23 22:44:21 +0100
  • 7fb622638b flip reload logic. Do not reload if there are not changes made to blacklist.txt Promofaux 2016-10-23 22:44:06 +0100
  • bd0cc134bf MERGE FAIL :ashamed_face: Promofaux 2016-10-23 22:43:11 +0100
  • 476fd1f695 indentation Promofaux 2016-10-23 22:38:18 +0100
  • 96053d13be Flip reload logic. Do not reload lists if no changes made to whitelist.txt Promofaux 2016-10-23 22:36:50 +0100
  • c958bed418 Consistency changes. Replace MOST uses of echo >> ${DebugLog} with usage of log_write function Promofaux 2016-10-23 22:31:20 +0100
  • 2b2c240d39 Fix shebang line broken in #831 Promofaux 2016-10-23 22:15:10 +0100
  • 1f0ae16216 Merge pull request #831 from airencracken/development Adam Warner 2016-10-23 20:03:30 +0100
  • b79392ba2c exit after displaying white/blacklist Promofaux 2016-10-23 19:49:51 +0100
  • 8ee98f0a4a remove a space Promofaux 2016-10-23 19:47:31 +0100
  • 82e78fb651 Add output to pihole disable and pihole enable Promofaux 2016-10-23 19:44:40 +0100
  • d0826b2c33 Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev Promofaux 2016-10-23 19:33:28 +0100
  • ff588200c0 Merge branch 'promoTweaksTheSecond' of https://github.com/pi-hole/pi-hole into promoTweaksTheSecond Promofaux 2016-10-23 19:11:36 +0100
  • 6cf7aa7866 Merge bc75ffc5a0 into 8f9ff930b3 tuplink 2016-10-23 02:16:24 +0000
  • bc75ffc5a0 remove time from script it is included in function now Tommy Huff 2016-10-22 22:15:29 -0400
  • 63a939b636 include $today in functions and grep them to make it daily Tommy Huff 2016-10-22 22:12:33 -0400
  • 92249365b4 use standard bash to remove CIDR Tommy Huff 2016-10-22 21:59:23 -0400
  • 5d6072524c Consistency Marcus Hildum 2016-10-22 10:26:00 -0700
  • 07a66a70fc Consistency Marcus Hildum 2016-10-22 10:12:05 -0700
  • 69ba8a3c2f Consistency Marcus Hildum 2016-10-22 10:01:15 -0700
  • a30c75ef71 Consistency Marcus Hildum 2016-10-22 00:35:44 -0700
  • d0b3727c5d Consistency Marcus Hildum 2016-10-22 00:32:36 -0700
  • 6e94bf5b6d Consistency Marcus Hildum 2016-10-22 00:14:38 -0700
  • 0f04e270a7 consistency Marcus Hildum 2016-10-22 00:10:25 -0700
  • ec4f5007e7 remove bad { Marcus Hildum 2016-10-21 23:59:31 -0700
  • 21b906e0e0 Consistency Marcus Hildum 2016-10-21 23:57:47 -0700
  • 7ebaf8e843 Consistency Marcus Hildum 2016-10-21 23:23:31 -0700
  • 640398ced4 Consistency Marcus Hildum 2016-10-21 23:17:14 -0700
  • ebbe1fc236 More consistency Marcus Hildum 2016-10-21 23:11:17 -0700
  • aac8e45397 Imbue gravity.sh with some consistency Marcus Hildum 2016-10-21 23:02:45 -0700
  • 5ebfa5ecf7 heredoc for helpfunc in pihole Marcus Hildum 2016-10-21 22:53:04 -0700
  • 12e041c9ef Merge remote-tracking branch 'upstream/development' into development Marcus Hildum 2016-10-21 22:49:21 -0700
  • 54913f06a3 Merge remote-tracking branch 'upstream/master' into development Marcus Hildum 2016-10-21 22:49:13 -0700
  • f1b8095f18 remove unneeded functions Tommy Huff 2016-10-21 20:15:24 -0400
  • cb8bfa06e7 move functions to pihole as they could be useful other places Tommy Huff 2016-10-21 20:05:37 -0400
  • caf65bb54c update chronometer.sh Tommy Huff 2016-10-21 16:28:31 -0400
  • 77f9b97cfd This makes two changes to the configureFirewall to make handling of iptables issues cleaner. Eric Warnke 2016-10-21 12:13:01 -0400
  • 44a36368a2 Merge pull request #822 from pi-hole/ChangeWarning Adam Warner 2016-10-21 11:24:12 +0100