From 99863bb799512b701be969e693693013145b8c6e Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Sat, 20 Feb 2016 10:33:04 -0600 Subject: [PATCH 01/14] pihole on ubuntu 14.04 Also moved a link from "coverage" into "projects" as it was more appropriate --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 207375f2..39bb7f23 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,9 @@ Once installed, [configure your router to have **DHCP clients use the Pi as thei [![Pi-hole exlplained](http://i.imgur.com/qNybJDX.png)](https://vimeo.com/135965232) ## Pi-hole Projects +- [Pi-hole on Ubuntu 14.04 on VirtualBox](http://hbalagtas.blogspot.com/2016/02/adblocking-with-pi-hole-and-ubuntu-1404.html) - [x86 Docker container that runs Pi-hole](https://hub.docker.com/r/diginc/pi-hole/) +- [Splunk: Pi-hole Visualizser](https://splunkbase.splunk.com/app/3023/) - [Pi-hole Chrome extension](https://chrome.google.com/webstore/detail/pi-hole-list-editor/hlnoeoejkllgkjbnnnhfolapllcnaglh) ([open source](https://github.com/packtloss/pihole-extension)) - [Go Bananas for CHiP-hole ad blocking](https://www.hackster.io/jacobsalmela/chip-hole-network-wide-ad-blocker-98e037) - [Sky-Hole](http://dlaa.me/blog/post/skyhole) @@ -34,7 +36,6 @@ Once installed, [configure your router to have **DHCP clients use the Pi as thei - [Minibian Pi-hole](http://munkjensen.net/wiki/index.php/See_my_Pi-Hole#Minibian_Pi-hole) ## Coverage -- [Splunk: Pi-hole Visualizser](https://splunkbase.splunk.com/app/3023/) - [The Defrag Show - MSDN/Channel 9](https://channel9.msdn.com/Shows/The-Defrag-Show/Defrag-Endoscope-USB-Camera-The-Final-HoloLens-Vote-Adblock-Pi-and-more?WT.mc_id=dlvr_twitter_ch9#time=20m39s) - [MacObserver Podcast 585](http://www.macobserver.com/tmo/podcast/macgeekgab-585) - [Medium: Block All Ads For $53](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d) From 52549d51abd90ee0536189e15c0db1fa0771d2fe Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 22 Feb 2016 09:24:17 +0000 Subject: [PATCH 02/14] Update adlists.default Add extra warning regarding mahakala.is list. See comment by @leichterleben in #341 --- adlists.default | 1 + 1 file changed, 1 insertion(+) diff --git a/adlists.default b/adlists.default index 81676a3d..0d99244f 100644 --- a/adlists.default +++ b/adlists.default @@ -25,6 +25,7 @@ https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt http://hosts-file.net/ad_servers.txt # Mahakala list. Has been known to block legitimage domains including the entire .com range. +# Warning: Due to the sheer size of this list, the web admin console will be unresponsive. #http://adblock.mahakala.is/ # ADZHOSTS list. Has been known to block legitimate domains From 6c58ea18dc349fcb5a7479c10b60b5ad47b00413 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Wed, 24 Feb 2016 12:02:18 -0500 Subject: [PATCH 03/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 39bb7f23..8df42072 100644 --- a/README.md +++ b/README.md @@ -93,4 +93,4 @@ You can view [real-time stats](http://pi-hole.net/faq/install-the-real-time-lcd- - There is also an [FAQ section on pi-hole.net](http://pi-hole.net) ## Other Operating Systems -This script will work for other UNIX-like systems with some slight **modifications**. As long as you can install `dnsmasq` and a Webserver, it should work OK. The automated install only works for a clean install of Raspiban right now since that is how the project originated. +This script will work for other UNIX-like systems with some slight **modifications**. As long as you can install `dnsmasq` and a Webserver, it should work OK. The automated install is only for a clean install of a Debian based system, such as the Raspberry Pi. From 2182b8339e971f76296ac4c683dbefbe7a1bcc3e Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Fri, 4 Mar 2016 04:22:54 -0800 Subject: [PATCH 04/14] Add social addresses --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 8df42072..ed8b7e4b 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,10 @@ Once installed, [configure your router to have **DHCP clients use the Pi as thei ## Pi-hole Is Free, But Powered By Your Donations [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "Free, but powered by donations")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY "Donate") +## Catch us out on the net: +Twitter: @The_Pi_Hole +reddit: /r/pihole + ## How Does It Work? **Watch the 60-second video below to get a quick overview** From 4230b0388461547c5eeed615ad104155d94586bc Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Fri, 4 Mar 2016 07:34:17 -0500 Subject: [PATCH 05/14] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ed8b7e4b..69ae4c2a 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Once installed, [configure your router to have **DHCP clients use the Pi as thei ## Catch us out on the net: Twitter: @The_Pi_Hole + reddit: /r/pihole ## How Does It Work? From b1554d6a890ced0c6e51d56cd93821c34319186d Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Fri, 4 Mar 2016 04:38:31 -0800 Subject: [PATCH 06/14] Add links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 69ae4c2a..af57dc88 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,9 @@ Once installed, [configure your router to have **DHCP clients use the Pi as thei [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "Free, but powered by donations")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY "Donate") ## Catch us out on the net: -Twitter: @The_Pi_Hole +Twitter: [@The_Pi_Hole](https://twitter.com/The_Pi_Hole) -reddit: /r/pihole +reddit: [/r/pihole](https://www.reddit.com/r/pihole/) ## How Does It Work? **Watch the 60-second video below to get a quick overview** From 0ed30b802d5820bca40a01464e54e86ff796b144 Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Fri, 4 Mar 2016 11:52:19 -0600 Subject: [PATCH 07/14] adafruit blog mention --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index af57dc88..0e21693c 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ reddit: [/r/pihole](https://www.reddit.com/r/pihole/) - [Minibian Pi-hole](http://munkjensen.net/wiki/index.php/See_my_Pi-Hole#Minibian_Pi-hole) ## Coverage +- [Pi-hole on Adafruit's blog](https://blog.adafruit.com/2016/03/04/pi-hole-is-a-black-hole-for-internet-ads-piday-raspberrypi-raspberry_pi/) - [The Defrag Show - MSDN/Channel 9](https://channel9.msdn.com/Shows/The-Defrag-Show/Defrag-Endoscope-USB-Camera-The-Final-HoloLens-Vote-Adblock-Pi-and-more?WT.mc_id=dlvr_twitter_ch9#time=20m39s) - [MacObserver Podcast 585](http://www.macobserver.com/tmo/podcast/macgeekgab-585) - [Medium: Block All Ads For $53](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d) From 3283f3ed7d2ae782ae8b7703849e1cb45aebd615 Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Fri, 4 Mar 2016 12:07:29 -0600 Subject: [PATCH 08/14] Show off our pretty dashboard --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0e21693c..d250c4d0 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,8 @@ The [Web interface](https://github.com/jacobsalmela/AdminLTE#pi-hole-admin-dashb `http://192.168.1.x/admin/index.php` +![Pi-hole Advanced Stats Dashboard](http://i.imgur.com/rTlLYPh.png) + ### API A basic read-only API can be accessed at `/admin/api.php`. It returns the following JSON: From f09745b4ad963e22811195327299b865a68f1619 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Tue, 8 Mar 2016 16:28:45 -0500 Subject: [PATCH 09/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d250c4d0..0665b47d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Automated Install -##### Designed For Raspberry Pi A+, B, B+, 2, and Zero (with an Ethernet adapter) +##### Designed For Raspberry Pi A+, B, B+, 2, and Zero (with an Ethernet/Wi-Fi adapter) 1. Install Raspbian 2. Run the command below From eb462955feb3c9da3713b54a80ed07e91eda1f95 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Wed, 16 Mar 2016 05:06:03 -0700 Subject: [PATCH 10/14] Secure Pulls now with HTTPS Closes #310 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0665b47d..1a181d6f 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ 1. Install Raspbian 2. Run the command below -### ```curl -L install.pi-hole.net | bash``` +### ```curl -L https://install.pi-hole.net | bash``` #### Alternative Semi-Automated install #### ``` -wget -O basic-install.sh install.pi-hole.net +wget -O basic-install.sh https://install.pi-hole.net chmod +x basic-install.sh ./basic-install.sh ``` From fad5fafa328923f47d1f3a2a04fff49abfe76e43 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 20 Mar 2016 13:26:02 +0000 Subject: [PATCH 11/14] Increase disk space to verify... .. was missing a couple of zeros, and not verifying enough space! Fixes #384 --- automated install/basic-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index b3e6202f..3a53f6dc 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -117,8 +117,8 @@ welcomeDialogs() { verifyFreeDiskSpace() { - # 25MB is the minimum space needed (20MB install + 5MB one day of logs.) - requiredFreeBytes=51200 + # 50MB is the minimum space needed (45MB install (includes web admin bootstrap/jquery libraries etc) + 5MB one day of logs.) + requiredFreeBytes=5000000 existingFreeBytes=`df -lk / 2>&1 | awk '{print $4}' | head -2 | tail -1` if ! [[ "$existingFreeBytes" =~ ^([0-9])+$ ]]; then From 02bb5b6742c92426b8677626bc51647fdbec4f59 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 20 Mar 2016 20:50:31 +0000 Subject: [PATCH 12/14] Revert previous change Reopens #384 --- automated install/basic-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 3a53f6dc..7365104d 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -118,7 +118,7 @@ welcomeDialogs() { verifyFreeDiskSpace() { # 50MB is the minimum space needed (45MB install (includes web admin bootstrap/jquery libraries etc) + 5MB one day of logs.) - requiredFreeBytes=5000000 + requiredFreeBytes=51200 existingFreeBytes=`df -lk / 2>&1 | awk '{print $4}' | head -2 | tail -1` if ! [[ "$existingFreeBytes" =~ ^([0-9])+$ ]]; then From fa2cef639566c5763d6998c4c0afe2915a2b897f Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Mon, 21 Mar 2016 08:29:19 -0500 Subject: [PATCH 13/14] link to get LED alerts article added a link to a cool project that makes an LED blink for each ad that gets blocked. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1a181d6f..4ad56250 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ reddit: [/r/pihole](https://www.reddit.com/r/pihole/) [![Pi-hole exlplained](http://i.imgur.com/qNybJDX.png)](https://vimeo.com/135965232) ## Pi-hole Projects +- [Get LED alerts for each blocked ad](http://www.stinebaugh.info/get-led-alerts-for-each-blocked-ad-using-pi-hole/) - [Pi-hole on Ubuntu 14.04 on VirtualBox](http://hbalagtas.blogspot.com/2016/02/adblocking-with-pi-hole-and-ubuntu-1404.html) - [x86 Docker container that runs Pi-hole](https://hub.docker.com/r/diginc/pi-hole/) - [Splunk: Pi-hole Visualizser](https://splunkbase.splunk.com/app/3023/) From 396c7ab9eebf75e1364056113d50d1c78342d342 Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Tue, 22 Mar 2016 21:21:08 -0500 Subject: [PATCH 14/14] link to tekthing mention tekthing mentioned us again as one of 5 easy projects for the Raspberry Pi. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4ad56250..28e6791b 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,7 @@ reddit: [/r/pihole](https://www.reddit.com/r/pihole/) - [Minibian Pi-hole](http://munkjensen.net/wiki/index.php/See_my_Pi-Hole#Minibian_Pi-hole) ## Coverage +- [TekThing: 5 fun, easy projects for a Raspberry Pi](https://youtu.be/QwrKlyC2kdM?t=1m42s) - [Pi-hole on Adafruit's blog](https://blog.adafruit.com/2016/03/04/pi-hole-is-a-black-hole-for-internet-ads-piday-raspberrypi-raspberry_pi/) - [The Defrag Show - MSDN/Channel 9](https://channel9.msdn.com/Shows/The-Defrag-Show/Defrag-Endoscope-USB-Camera-The-Final-HoloLens-Vote-Adblock-Pi-and-more?WT.mc_id=dlvr_twitter_ch9#time=20m39s) - [MacObserver Podcast 585](http://www.macobserver.com/tmo/podcast/macgeekgab-585)