Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-25 22:30:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into development

Browse source
This commit is contained in:
Promofaux 2016-01-31 20:48:19 +00:00
commit 8126e9f4b1
13 changed files with 108 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
advanced/01-pihole.conf
View file

@ -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 # If you want dnsmasq to read another file, as well as /etc/hosts, use
# this. # this.
addn-hosts=/etc/pihole/gravity.list addn-hosts=/etc/pihole/gravity.list

7
advanced/Scripts/blacklist.sh
View file

@ -1,6 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# (c) 2015 by Jacob Salmela # Pi-hole: A black hole for Internet advertisements
# This file is part of Pi-hole. # (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 # 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 # it under the terms of the GNU General Public License as published by

7
advanced/Scripts/chronometer.sh
View file

@ -1,6 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# (c) 2015 by Jacob Salmela # Pi-hole: A black hole for Internet advertisements
# This file is part of Pi-hole. # (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 # 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 # it under the terms of the GNU General Public License as published by

14
advanced/Scripts/piholeLogFlush.sh
View file

@ -1,11 +1,13 @@
#!/usr/bin/env bash #!/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 # 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 # 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 # it under the terms of the GNU General Public License as published by
#the Free Software Foundation, either version 2 of the License, or # the Free Software Foundation, either version 2 of the License, or
#(at your option) any later version. # (at your option) any later version.
truncate -s 0 /var/log/pihole.log truncate -s 0 /var/log/pihole.log

19
advanced/Scripts/updateDashboard.sh
View file

@ -1,15 +1,14 @@
#!/usr/bin/env bash #!/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. # 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
# if this is the first time running this script after an # the Free Software Foundation, either version 2 of the License, or
# existing installation, the existing web interface files # (at your option) any later version.
# 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
#
WEB_INTERFACE_GIT_URL="https://github.com/pi-hole/AdminLTE.git" WEB_INTERFACE_GIT_URL="https://github.com/pi-hole/AdminLTE.git"
WEB_INTERFACE_DIR="/var/www/html/admin" WEB_INTERFACE_DIR="/var/www/html/admin"

7
advanced/Scripts/whitelist.sh
View file

@ -1,6 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# (c) 2015 by Jacob Salmela # Pi-hole: A black hole for Internet advertisements
# This file is part of Pi-hole. # (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 # 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 # it under the terms of the GNU General Public License as published by

11
advanced/dphys-swapfile
View file

@ -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 CONF_SWAPSIZE=500

11
advanced/lighttpd.conf
View file

@ -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 = ( server.modules = (
"mod_access", "mod_access",
"mod_accesslog", "mod_accesslog",

11
advanced/pihole.cron
View file

@ -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 # Pi-hole: Update the ad sources once a week on Sunday at 01:59
# Download any updates from the ad lists # Download any updates from the ad lists
59 1 * * 7 root /usr/local/bin/gravity.sh 59 1 * * 7 root /usr/local/bin/gravity.sh

8
automated install/basic-install.sh
View file

@ -1,15 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Pi-hole: A black hole for Internet advertisements # 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 # Network-wide ad blocking via your Raspberry Pi
# # http://pi-hole.net
# (c) 2015 by Jacob Salmela # Installs Pi-hole
# This file is part of Pi-hole.
# #
# Pi-hole is free software: you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or # the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version. # (at your option) any later version.
# pi-hole.net/donate # pi-hole.net/donate
# #
# Install with this command (from your Pi): # Install with this command (from your Pi):

8
automated install/uninstall.sh
View file

@ -1,7 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Completely uninstalls the Pi-hole # Pi-hole: A black hole for Internet advertisements
# (c) 2015 by Jacob Salmela # (c) 2015, 2016 by Jacob Salmela
# This file is part of Pi-hole. # 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 # 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 # it under the terms of the GNU General Public License as published by

11
block hulu ads/lighttpd.conf
View file

@ -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 = ( server.modules = (
"mod_access", "mod_access",
"mod_alias", "mod_alias",

11
block hulu ads/minidlna.conf
View file

@ -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
# 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/ media_dir=V,/var/lib/minidlna/videos/
port=8200 port=8200
friendly_name=pihole friendly_name=pihole