From a1204cf246e851983e2a2ee51acbf000fff17544 Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Sat, 30 Jan 2016 10:20:01 -0600 Subject: [PATCH 1/2] splunk app --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 19ab0241..a0bf4cc3 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ 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 48f9a61ff0f577b61c6e9129ed59f13ff242678d Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Sat, 30 Jan 2016 15:12:40 -0500 Subject: [PATCH 2/2] Updated License --- advanced/Scripts/blacklist.sh | 7 +++++-- advanced/Scripts/chronometer.sh | 7 +++++-- advanced/Scripts/piholeLogFlush.sh | 14 ++++++++------ advanced/Scripts/updateDashboard.sh | 19 +++++++++---------- advanced/Scripts/whitelist.sh | 7 +++++-- advanced/dnsmasq.conf | 11 +++++++++++ advanced/dphys-swapfile | 11 +++++++++++ advanced/lighttpd.conf | 11 +++++++++++ advanced/pihole.cron | 11 +++++++++++ automated install/basic-install.sh | 8 ++++---- automated install/uninstall.sh | 8 +++++--- block hulu ads/lighttpd.conf | 11 +++++++++++ block hulu ads/minidlna.conf | 13 ++++++++++++- 13 files changed, 108 insertions(+), 30 deletions(-) diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh index 3e7753d3..70b8131a 100644 --- a/advanced/Scripts/blacklist.sh +++ b/advanced/Scripts/blacklist.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash -# (c) 2015 by Jacob Salmela -# This file is part of Pi-hole. +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# Blacklists domains # # Pi-hole is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh index 54916d6e..2fe00498 100755 --- a/advanced/Scripts/chronometer.sh +++ b/advanced/Scripts/chronometer.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash -# (c) 2015 by Jacob Salmela -# This file is part of Pi-hole. +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# Calculates stats and displays to an LCD # # Pi-hole is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/advanced/Scripts/piholeLogFlush.sh b/advanced/Scripts/piholeLogFlush.sh index 832c98c9..bbcf1ade 100755 --- a/advanced/Scripts/piholeLogFlush.sh +++ b/advanced/Scripts/piholeLogFlush.sh @@ -1,11 +1,13 @@ #!/usr/bin/env bash +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net # Flushes /var/log/pihole.log -# (c) 2015 by Jacob Salmela -# This file is part of Pi-hole. # -#Pi-hole is free software: you can redistribute it and/or modify -#it under the terms of the GNU General Public License as published by -#the Free Software Foundation, either version 2 of the License, or -#(at your option) any later version. +# Pi-hole is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. truncate -s 0 /var/log/pihole.log diff --git a/advanced/Scripts/updateDashboard.sh b/advanced/Scripts/updateDashboard.sh index 11de6264..edf04896 100644 --- a/advanced/Scripts/updateDashboard.sh +++ b/advanced/Scripts/updateDashboard.sh @@ -1,15 +1,14 @@ #!/usr/bin/env bash +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# Updates the Pi-hole web interface # -# this script will update the pihole web interface files. -# -# if this is the first time running this script after an -# existing installation, the existing web interface files -# will be removed and replaced with the latest master -# branch from github. subsequent executions of this script -# will pull the latest version of the web interface. -# -# @TODO: add git as requirement to basic-install.sh -# +# Pi-hole is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. WEB_INTERFACE_GIT_URL="https://github.com/pi-hole/AdminLTE.git" WEB_INTERFACE_DIR="/var/www/html/admin" diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh index 500d65df..853c3b79 100755 --- a/advanced/Scripts/whitelist.sh +++ b/advanced/Scripts/whitelist.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash -# (c) 2015 by Jacob Salmela -# This file is part of Pi-hole. +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# Whitelists domains # # Pi-hole is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/advanced/dnsmasq.conf b/advanced/dnsmasq.conf index 25f52a57..a0b77a5e 100644 --- a/advanced/dnsmasq.conf +++ b/advanced/dnsmasq.conf @@ -1,3 +1,14 @@ +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# dnsmasq config for Pi-hole +# +# Pi-hole is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. + # If you want dnsmasq to read another file, as well as /etc/hosts, use # this. addn-hosts=/etc/pihole/gravity.list diff --git a/advanced/dphys-swapfile b/advanced/dphys-swapfile index 229f00e6..d8225175 100644 --- a/advanced/dphys-swapfile +++ b/advanced/dphys-swapfile @@ -1 +1,12 @@ +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# Swap file config +# +# Pi-hole is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. + CONF_SWAPSIZE=500 diff --git a/advanced/lighttpd.conf b/advanced/lighttpd.conf index 6b33fa50..5a662ffa 100644 --- a/advanced/lighttpd.conf +++ b/advanced/lighttpd.conf @@ -1,3 +1,14 @@ +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# lighttpd config for Pi-hole +# +# Pi-hole is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. + server.modules = ( "mod_access", "mod_accesslog", diff --git a/advanced/pihole.cron b/advanced/pihole.cron index 57f1c10c..83b431a4 100644 --- a/advanced/pihole.cron +++ b/advanced/pihole.cron @@ -1,3 +1,14 @@ +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# Updates ad sources every week +# +# Pi-hole is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. + # Pi-hole: Update the ad sources once a week on Sunday at 01:59 # Download any updates from the ad lists 59 1 * * 7 root /usr/local/bin/gravity.sh diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 871f1884..8569d00b 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1,15 +1,15 @@ #!/usr/bin/env bash # Pi-hole: A black hole for Internet advertisements -# by Jacob Salmela +# (c) 2015, 2016 by Jacob Salmela # Network-wide ad blocking via your Raspberry Pi -# -# (c) 2015 by Jacob Salmela -# This file is part of Pi-hole. +# http://pi-hole.net +# Installs Pi-hole # # Pi-hole is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. + # pi-hole.net/donate # # Install with this command (from your Pi): diff --git a/automated install/uninstall.sh b/automated install/uninstall.sh index 59eca67b..ee4e80a0 100644 --- a/automated install/uninstall.sh +++ b/automated install/uninstall.sh @@ -1,7 +1,9 @@ #!/usr/bin/env bash -# Completely uninstalls the Pi-hole -# (c) 2015 by Jacob Salmela -# This file is part of Pi-hole. +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# Completely uninstalls Pi-hole # # Pi-hole is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/block hulu ads/lighttpd.conf b/block hulu ads/lighttpd.conf index b22f599e..9e8d1f80 100644 --- a/block hulu ads/lighttpd.conf +++ b/block hulu ads/lighttpd.conf @@ -1,3 +1,14 @@ +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# Lighttpd config file for Pi-hole +# +# Pi-hole is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. + server.modules = ( "mod_access", "mod_alias", diff --git a/block hulu ads/minidlna.conf b/block hulu ads/minidlna.conf index 9eccc7b6..3f9e188f 100644 --- a/block hulu ads/minidlna.conf +++ b/block hulu ads/minidlna.conf @@ -1,6 +1,17 @@ +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# MiniDLNA config file for Pi-hole +# +# Pi-hole is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. + media_dir=V,/var/lib/minidlna/videos/ port=8200 friendly_name=pihole serial=12345678 model_number=1 -inotify=yes \ No newline at end of file +inotify=yes