mirror of
https://github.com/moparisthebest/pi-hole
synced 2024-12-01 05:22:19 -05:00
hosts format script
This commit is contained in:
jacobsalmela
parent
15c84db022
commit
56c776af22
@ -1,9 +0,0 @@
|
|||||||
domain-needed
|
|
||||||
bogus-priv
|
|
||||||
no-resolv
|
|
||||||
server=127.0.0.1
|
|
||||||
server=8.8.8.8
|
|
||||||
server=8.8.4.4
|
|
||||||
interface=eth0
|
|
||||||
cache-size=10000
|
|
||||||
log-queries
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
# !/bin/bash
|
|
||||||
# Download the ad list
|
|
||||||
sudo /usr/local/bin/gravity.sh
|
|
||||||
|
|
||||||
# Enable DNS and start blocking ads
|
|
||||||
sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
|
|
||||||
sudo mv /etc/dnsmasq.conf.pihole /etc/dnsmasq.conf
|
|
||||||
sudo service dnsmasq start
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# /usr/local/bin/gravity.sh
|
|
||||||
|
|
||||||
# URL to pull list of known ad servers from
|
|
||||||
adListURL="http://pgl.yoyo.org/adservers/serverlist.php?hostformat=dnsmasq&showintro=0&mimetype=plaintext"
|
|
||||||
|
|
||||||
# Address to send ads to
|
|
||||||
piholeIP="127.0.0.1"
|
|
||||||
|
|
||||||
# Where the list of ad servers are stored once downloaded
|
|
||||||
# Any file in /etc/dnsmasq.d is loaded automatically when the service starts
|
|
||||||
adFile="/etc/dnsmasq.d/adList.conf"
|
|
||||||
|
|
||||||
# The temporary file for holding
|
|
||||||
eventHorizion="/etc/dnsmasq.d/adList.conf.tmp"
|
|
||||||
|
|
||||||
# Parses out the default 127.0.0.1 address and replaces it with the IP where ads will be sent
|
|
||||||
curl $adListURL | sed "s/127\.0\.0\.1/$piholeIP/" > $eventHorizion
|
|
||||||
|
|
||||||
sleep 10
|
|
||||||
|
|
||||||
# If the temporary list of ad servers already exists (the eventHorizion)
|
|
||||||
if [ -f "$eventHorizion" ];then
|
|
||||||
# Then replace it as the new ad file
|
|
||||||
mv -f $eventHorizion $adFile
|
|
||||||
else
|
|
||||||
echo "Error building the ad list, please try again."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
server.modules = (
|
|
||||||
"mod_access",
|
|
||||||
"mod_alias",
|
|
||||||
"mod_compress",
|
|
||||||
"mod_redirect",
|
|
||||||
"mod_auth",
|
|
||||||
"mod_rewrite"
|
|
||||||
)
|
|
||||||
|
|
||||||
server.document-root = "/var/www"
|
|
||||||
server.upload-dirs = ( "/var/cache/lighttpd/uploads" )
|
|
||||||
server.errorlog = "/var/log/lighttpd/error.log"
|
|
||||||
server.pid-file = "/var/run/lighttpd.pid"
|
|
||||||
server.username = "www-data"
|
|
||||||
server.groupname = "www-data"
|
|
||||||
server.port = 80
|
|
||||||
|
|
||||||
|
|
||||||
index-file.names = ( "index.php", "index.html", "index.lighttpd.html" )
|
|
||||||
url.access-deny = ( "~", ".inc" )
|
|
||||||
static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
|
|
||||||
|
|
||||||
compress.cache-dir = "/var/cache/lighttpd/compress/"
|
|
||||||
compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" )
|
|
||||||
|
|
||||||
# default listening port for IPv6 falls back to the IPv4 port
|
|
||||||
include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
|
|
||||||
include_shell "/usr/share/lighttpd/create-mime.assign.pl"
|
|
||||||
include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
|
|
||||||
|
|
||||||
# Rewrites all URLs to the /var/www/pihole/index.html
|
|
||||||
# This should be a blank file (for speed)
|
|
||||||
$HTTP["host"] =~ ".*" {
|
|
||||||
url.rewrite = (".*" => "pihole/index.html")
|
|
||||||
}
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# Pi-hole automated install
|
|
||||||
# Raspberry Pi Ad-blocker
|
|
||||||
#
|
|
||||||
# Install with this command (from the Pi):
|
|
||||||
#
|
|
||||||
# curl -s "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/automated%20install/basic-install.sh" | bash
|
|
||||||
#
|
|
||||||
# Or run the commands below in order
|
|
||||||
|
|
||||||
clear
|
|
||||||
echo " _____ _ _ _ "
|
|
||||||
echo " | __ (_) | | | | "
|
|
||||||
echo " | |__) | __ | |__ ___ | | ___ "
|
|
||||||
echo " | ___/ | |__| | '_ \ / _ \| |/ _ \ "
|
|
||||||
echo " | | | | | | | | (_) | | __/ "
|
|
||||||
echo " |_| |_| |_| |_|\___/|_|\___| "
|
|
||||||
echo " "
|
|
||||||
echo " Raspberry Pi Ad-blocker "
|
|
||||||
echo " "
|
|
||||||
echo " Automated install "
|
|
||||||
echo " --Advanced-- "
|
|
||||||
echo " "
|
|
||||||
echo " "
|
|
||||||
sleep 2
|
|
||||||
|
|
||||||
echo "Updating the Pi..."
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get -y upgrade
|
|
||||||
|
|
||||||
echo "Installing DNS..."
|
|
||||||
sudo apt-get -y install dnsutils dnsmasq
|
|
||||||
|
|
||||||
echo "Installing a Web server"
|
|
||||||
sudo apt-get -y install lighttpd
|
|
||||||
sudo chown www-data:www-data /var/www
|
|
||||||
sudo chmod 775 /var/www
|
|
||||||
sudo usermod -a -G www-data pi
|
|
||||||
|
|
||||||
echo "Stopping services to modify them..."
|
|
||||||
sudo service dnsmasq stop
|
|
||||||
sudo service lighttpd stop
|
|
||||||
|
|
||||||
echo "Backing up original config files and downloading Pi-hole ones..."
|
|
||||||
sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
|
|
||||||
sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
|
|
||||||
sudo mv /var/www/index.lighttpd.html /var/www/index.lighttpd.orig
|
|
||||||
sudo curl -o /etc/dnsmasq.conf "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf"
|
|
||||||
sudo curl -o /etc/lighttpd/lighttpd.conf "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf"
|
|
||||||
sudo mkdir /var/www/pihole
|
|
||||||
sudo curl -o /var/www/pihole/index.html "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/index.html"
|
|
||||||
|
|
||||||
echo "Turning services back on..."
|
|
||||||
sudo service dnsmasq start
|
|
||||||
sudo service lighttpd start
|
|
||||||
|
|
||||||
echo "Locating the Pi-hole..."
|
|
||||||
sudo curl -o /usr/local/bin/gravity.sh "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity-adv.sh"
|
|
||||||
sudo chmod 755 /usr/local/bin/gravity.sh
|
|
||||||
echo "Entering the event horizon..."
|
|
||||||
sudo /usr/local/bin/gravity.sh
|
|
||||||
|
|
||||||
echo "Restarting services..."
|
|
||||||
sudo service dnsmasq restart
|
|
||||||
sudo service lighttpd restart
|
|
||||||
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
no-resolv
|
|
||||||
no-poll
|
|
||||||
server=/localnet/192.168.0.1
|
|
||||||
server=/localnet/8.8.8.8
|
|
||||||
server=/localnet/8.8.4.4
|
|
||||||
domain-needed
|
|
||||||
interface=eth0
|
|
||||||
strict-order
|
|
||||||
min-port=4096
|
|
||||||
cache-size=10000
|
|
||||||
log-queries
|
|
||||||
bogus-priv
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
address=/ads.hulu.com/192.168.1.101
|
|
||||||
address=/ads-v-darwin.hulu.com/192.168.1.101
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>Pi-hole blocked an ad</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>No ads here</h1>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
server.modules = (
|
|
||||||
"mod_access",
|
|
||||||
"mod_alias",
|
|
||||||
"mod_compress",
|
|
||||||
"mod_redirect",
|
|
||||||
# "mod_rewrite"
|
|
||||||
)
|
|
||||||
|
|
||||||
server.document-root = "/var/www"
|
|
||||||
server.upload-dirs = ( "/var/cache/lighttpd/uploads" )
|
|
||||||
server.errorlog = "/var/log/lighttpd/error.log"
|
|
||||||
server.pid-file = "/var/run/lighttpd.pid"
|
|
||||||
server.username = "www-data"
|
|
||||||
server.groupname = "www-data"
|
|
||||||
server.port = 80
|
|
||||||
|
|
||||||
|
|
||||||
index-file.names = ( "index.php", "index.html", "index.lighttpd.html" )
|
|
||||||
url.access-deny = ( "~", ".inc" )
|
|
||||||
static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
|
|
||||||
|
|
||||||
compress.cache-dir = "/var/cache/lighttpd/compress/"
|
|
||||||
compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" )
|
|
||||||
|
|
||||||
# default listening port for IPv6 falls back to the IPv4 port
|
|
||||||
include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
|
|
||||||
include_shell "/usr/share/lighttpd/create-mime.assign.pl"
|
|
||||||
include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
|
|
||||||
|
|
||||||
$HTTP["host"] =~ "ads.hulu.com|ads-v-darwin.hulu.com|" {
|
|
||||||
url.redirect = ( "^/(.*)" => "http://192.168.1.101:8200/MediaItems/19.mov")
|
|
||||||
}
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
media_dir=V,/var/lib/minidlna/videos/
|
|
||||||
port=8200
|
|
||||||
friendly_name=pihole
|
|
||||||
serial=12345678
|
|
||||||
model_number=1
|
|
||||||
inotify=yes
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
# !/bin/bash
|
|
||||||
# DNS config file
|
|
||||||
# Run as a local script since modifying it will disconnect the Internet connection
|
|
||||||
sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
|
|
||||||
sudo mv /etc/dnsmasq.conf.pihole /etc/dnsmasq.conf
|
|
||||||
sudo service dnsmasq start
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# Block Hulu Plus ads using a Raspberry Pi
|
|
||||||
|
|
||||||
# Install with this command (from the Pi):
|
|
||||||
#
|
|
||||||
# curl -s https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/block%20hulu%20ads/setup.sh | bash
|
|
||||||
#
|
|
||||||
# Or run the commands below in order
|
|
||||||
|
|
||||||
# Update the Pi
|
|
||||||
sudo apt-get update
|
|
||||||
#sudo apt-get -y upgrade
|
|
||||||
|
|
||||||
# Install DNS
|
|
||||||
sudo apt-get -y install dnsutils dnsmasq
|
|
||||||
sudo service dnsmasq stop
|
|
||||||
|
|
||||||
# Install Web server
|
|
||||||
sudo apt-get -y install lighttpd
|
|
||||||
sudo service lighttpd stop
|
|
||||||
|
|
||||||
# Install streaming software
|
|
||||||
sudo apt-get -y install minidlna
|
|
||||||
sudo service minidlna stop
|
|
||||||
|
|
||||||
# Configure Web server
|
|
||||||
#sudo lighty-enable-mod fastcgi-php
|
|
||||||
sudo chown www-data:www-data /var/www
|
|
||||||
sudo chmod 775 /var/www
|
|
||||||
sudo usermod -a -G www-data pi
|
|
||||||
sudo mv /var/www/index.lighttpd.html /var/www/index.lighttpd.orig
|
|
||||||
sudo curl -o /var/www/index.html "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/block%20hulu%20ads/index.html"
|
|
||||||
sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
|
|
||||||
sudo curl -o /etc/lighttpd/lighttpd.conf "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/block%20hulu%20ads/lighttpd.conf"
|
|
||||||
|
|
||||||
# Configure streaming service
|
|
||||||
sudo mv /etc/minidlna.conf /etc/minidlna.conf.orig
|
|
||||||
sudo mkdir /var/lib/minidlna/videos/
|
|
||||||
sudo curl -o /etc/minidlna.conf "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/block%20hulu%20ads/minidlna.conf"
|
|
||||||
sudo service minidlna start
|
|
||||||
sudo curl -o /var/lib/minidlna/videos/pi-hole.mov "https://dl.dropboxusercontent.com/u/16366947/Documents/Videos/pi-hole.mov"
|
|
||||||
sudo service minidlna force-reload
|
|
||||||
tail /var/log/minidlna.log
|
|
||||||
|
|
||||||
# Configure DNS
|
|
||||||
sudo curl -o /etc/dnsmasq.conf.pihole "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/dnsmasq.conf"
|
|
||||||
sudo curl -o /tmp/piholedns.sh "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/block%20hulu%20ads/setup-resolv.sh"
|
|
||||||
sudo chmod 755 /tmp/piholedns.sh
|
|
||||||
|
|
||||||
# Download [advanced] ad-blocking script and then run it
|
|
||||||
# http://jacobsalmela.com/raspberry-pi-ad-blocker-advanced-setup/
|
|
||||||
sudo curl -o /usr/local/bin/gravity.sh "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity-adv.sh"
|
|
||||||
sudo chmod 755 /usr/local/bin/gravity.sh
|
|
||||||
clear
|
|
||||||
echo ""
|
|
||||||
echo ""
|
|
||||||
echo ""
|
|
||||||
echo ""
|
|
||||||
echo "Go get some coffee--this will take a while"
|
|
||||||
echo ""
|
|
||||||
echo ""
|
|
||||||
echo ""
|
|
||||||
echo ""
|
|
||||||
sleep 5
|
|
||||||
sudo /usr/local/bin/gravity.sh
|
|
||||||
sudo service dnsmasq stop
|
|
||||||
|
|
||||||
# Restart everything to apply all the changes
|
|
||||||
sudo service lighttpd start
|
|
||||||
sudo service minidlna start
|
|
||||||
sudo /tmp/piholedns.sh
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
domain-needed
|
|
||||||
interface=eth0
|
|
||||||
min-port=4096
|
|
||||||
cache-size=10000
|
|
||||||
log-queries
|
|
||||||
bogus-priv
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# The Pi-hole now blocks over 120,000 ad domains
|
|
||||||
# Address to send ads to (the RPi)
|
|
||||||
piholeIP="127.0.0.1"
|
|
||||||
# Optionally, uncomment to automatically detect the local IP address.
|
|
||||||
#piholeIP=$(hostname -I)
|
|
||||||
|
|
||||||
# Config file to hold URL rules
|
|
||||||
eventHorizion="/etc/dnsmasq.d/adList.conf"
|
|
||||||
blacklist=/etc/pihole/blacklist.txt
|
|
||||||
whitelist=/etc/pihole/whitelist.txt
|
|
||||||
|
|
||||||
# Create the pihole resource directory if it doesn't exist. Future files will be stored here
|
|
||||||
if [[ -d /etc/pihole/ ]];then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "Forming pihole directory..."
|
|
||||||
sudo mkdir /etc/pihole
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Getting yoyo ad list..." # Approximately 2452 domains at the time of writing
|
|
||||||
curl -s -d mimetype=plaintext -d hostformat=unixhosts http://pgl.yoyo.org/adservers/serverlist.php? | sort > /tmp/matter.txt
|
|
||||||
echo "Getting winhelp2002 ad list..." # 12985 domains
|
|
||||||
curl -s http://winhelp2002.mvps.org/hosts.txt | grep -v "#" | grep -v "127.0.0.1" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' | sort >> /tmp/matter.txt
|
|
||||||
echo "Getting adaway ad list..." # 445 domains
|
|
||||||
curl -s https://adaway.org/hosts.txt | grep -v "#" | grep -v "::1" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' | grep -v '^\\' | grep -v '\\$' | sort >> /tmp/matter.txt
|
|
||||||
echo "Getting hosts-file ad list..." # 28050 domains
|
|
||||||
curl -s http://hosts-file.net/.%5Cad_servers.txt | grep -v "#" | grep -v "::1" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' | grep -v '^\\' | grep -v '\\$' | sort >> /tmp/matter.txt
|
|
||||||
echo "Getting malwaredomainlist ad list..." # 1352 domains
|
|
||||||
curl -s http://www.malwaredomainlist.com/hostslist/hosts.txt | grep -v "#" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $3}' | grep -v '^\\' | grep -v '\\$' | sort >> /tmp/matter.txt
|
|
||||||
echo "Getting adblock.gjtech ad list..." # 696 domains
|
|
||||||
curl -s http://adblock.gjtech.net/?format=unix-hosts | grep -v "#" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' | grep -v '^\\' | grep -v '\\$' | sort >> /tmp/matter.txt
|
|
||||||
echo "Getting someone who cares ad list..." # 10600
|
|
||||||
curl -s http://someonewhocares.org/hosts/hosts | grep -v "#" | sed '/^$/d' | sed 's/\ /\\ /g' | grep -v '^\\' | grep -v '\\$' | awk '{print $2}' | grep -v '^\\' | grep -v '\\$' | sort >> /tmp/matter.txt
|
|
||||||
echo "Getting Mother of All Ad Blocks list..." # 102168 domains!! Thanks Kacy
|
|
||||||
curl -A 'Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0' -e http://forum.xda-developers.com/ http://adblock.mahakala.is/ | grep -v "#" | awk '{print $2}' | sort >> /tmp/matter.txt
|
|
||||||
|
|
||||||
# Add entries from the local blacklist file if it exists in /etc/pihole directory
|
|
||||||
if [[ -f $blacklist ]];then
|
|
||||||
echo "Getting the local blacklist from /etc/pihole directory"
|
|
||||||
cat $blacklist >> /tmp/matter.txt
|
|
||||||
else
|
|
||||||
:
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Sort the aggregated results and remove any duplicates
|
|
||||||
# Remove entries from the whitelist file if it exists at the root of the current user's home folder
|
|
||||||
if [[ -f $whitelist ]];then
|
|
||||||
echo "Removing duplicates, whitelisting, and formatting the list of domains..."
|
|
||||||
cat /tmp/matter.txt | sed $'s/\r$//' | sort | uniq | sed '/^$/d' | grep -v -x -f $whitelist | awk -v "IP=$piholeIP" '{sub(/\r$/,""); print "address=/"$0"/"IP}' > /tmp/andLight.txt
|
|
||||||
numberOfSitesWhitelisted=$(cat $whitelist | wc -l | sed 's/^[ \t]*//')
|
|
||||||
echo "$numberOfSitesWhitelisted domains whitelisted."
|
|
||||||
else
|
|
||||||
echo "Removing duplicates and formatting the list of domains..."
|
|
||||||
cat /tmp/matter.txt | sed $'s/\r$//' | sort | uniq | sed '/^$/d' | awk -v "IP=$piholeIP" '{sub(/\r$/,""); print "address=/"$0"/"IP}' > /tmp/andLight.txt
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Count how many domains/whitelists were added so it can be displayed to the user
|
|
||||||
numberOfAdsBlocked=$(cat /tmp/andLight.txt | wc -l | sed 's/^[ \t]*//')
|
|
||||||
echo "$numberOfAdsBlocked ad domains blocked."
|
|
||||||
|
|
||||||
# Turn the file into a dnsmasq config file
|
|
||||||
sudo mv /tmp/andLight.txt $eventHorizion
|
|
||||||
|
|
||||||
# Restart DNS
|
|
||||||
sudo service dnsmasq restart
|
|
||||||
130
gravity.sh
Normal file → Executable file
130
gravity.sh
Normal file → Executable file
@ -1,28 +1,116 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# /usr/local/bin/gravity.sh
|
# http://pi-hole.net
|
||||||
|
|
||||||
# URL to pull list of known ad servers from
|
# Ad-list sources--one per line in single quotes
|
||||||
adListURL="http://pgl.yoyo.org/adservers/serverlist.php?hostformat=dnsmasq&showintro=0&mimetype=plaintext"
|
sources=('https://adaway.org/hosts.txt'
|
||||||
|
'http://adblock.gjtech.net/?format=unix-hosts'
|
||||||
|
'http://adblock.mahakala.is/'
|
||||||
|
'http://hosts-file.net/.%5Cad_servers.txt'
|
||||||
|
'http://www.malwaredomainlist.com/hostslist/hosts.txt'
|
||||||
|
'http://pgl.yoyo.org/adservers/serverlist.php?'
|
||||||
|
'http://someonewhocares.org/hosts/hosts'
|
||||||
|
'http://winhelp2002.mvps.org/hosts.txt')
|
||||||
|
|
||||||
# Address to send ads to
|
# Variables for various stages of downloading and formatting the list
|
||||||
piholeIP="127.0.0.1"
|
origin=~/Desktop/pihole
|
||||||
|
piholeDir=/etc/pihole
|
||||||
|
justDomainsExtension=domains
|
||||||
|
matter=pihole.0.matter.txt
|
||||||
|
andLight=pihole.1.andLight.txt
|
||||||
|
supernova=pihole.2.supernova.txt
|
||||||
|
eventHorizon=pihole.3.eventHorizon.txt
|
||||||
|
accretionDisc=pihole.4.accretionDisc.txt
|
||||||
|
eyeOfTheNeedle=pihole.5.wormhole.txt
|
||||||
|
adList=/etc/hosts
|
||||||
|
blacklist=$piholeDir/blacklist.txt
|
||||||
|
latentBlacklist=$origin/latentBlacklist.txt
|
||||||
|
whitelist=$piholeDir/whitelist.txt
|
||||||
|
latentWhitelist=$origin/latentWhitelist.txt
|
||||||
|
|
||||||
# Where the list of ad servers are stored once downloaded
|
echo "** Neutrino emissions detected..."
|
||||||
# Any file in /etc/dnsmasq.d is loaded automatically when the service starts
|
|
||||||
adFile="/etc/dnsmasq.d/adList.conf"
|
|
||||||
|
|
||||||
# The temporary file for holding
|
# Create the pihole resource directory if it doesn't exist. Future files will be stored here
|
||||||
eventHorizion="/etc/dnsmasq.d/adList.conf.tmp"
|
if [[ -d /etc/pihole/ ]];then
|
||||||
|
:
|
||||||
# Parses out the default 127.0.0.1 address and replaces it with the IP where ads will be sent
|
|
||||||
curl $adListURL | sed "s/127\.0\.0\.1/$piholeIP/" > $eventHorizion
|
|
||||||
|
|
||||||
# If the temporary list of ad servers already exists (the eventHorizion)
|
|
||||||
if [ -f "$eventHorizion" ];then
|
|
||||||
# Then replace it as the new ad file
|
|
||||||
mv -f $eventHorizion $adFile
|
|
||||||
else
|
else
|
||||||
echo "Error building the ad list, please try again."
|
echo "** Creating pihole directory..."
|
||||||
exit 1
|
sudo mkdir /etc/pihole
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Loop through domain list. Download each one and remove commented lines (lines beginning with '# 'or '/') and blank lines
|
||||||
|
for ((i = 0; i < "${#sources[@]}"; i++))
|
||||||
|
do
|
||||||
|
# Get just the domain from the URL
|
||||||
|
domain=$(echo "${sources[$i]}" | cut -d'/' -f3)
|
||||||
|
|
||||||
|
# Save the file as list.#.domain
|
||||||
|
saveLocation=$origin/"list"."$i"."$domain"
|
||||||
|
|
||||||
|
# Use a case statement to download lists that need special cURL commands to complete properly
|
||||||
|
case "$domain" in
|
||||||
|
"adblock.mahakala.is") data=$(curl -s -A 'Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0' -e http://forum.xda-developers.com/ -z $saveLocation."$justDomainsExtension" "${sources[$i]}");;
|
||||||
|
|
||||||
|
"pgl.yoyo.org") data=$(curl -s -d mimetype=plaintext -d hostformat=hosts -z $saveLocation."$justDomainsExtension" "${sources[$i]}");;
|
||||||
|
|
||||||
|
*) data=$(curl -s -z $saveLocation."$justDomainsExtension" -A "Mozilla/10.0" "${sources[$i]}");;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if [[ -n "$data" ]];then
|
||||||
|
echo "Getting $domain list..."
|
||||||
|
# Remove comments and print only the domain name
|
||||||
|
echo "$data" | awk 'NF {if ($1 !~ "#") print $2}' > $saveLocation."$justDomainsExtension"
|
||||||
|
else
|
||||||
|
echo "Skipping $domain list because it does not have any new entries..."
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Find all files with the .domains extension and compile them into one file
|
||||||
|
echo "** Aggregating list of domains..."
|
||||||
|
find $origin/ -type f -name "*.$justDomainsExtension" -exec cat {} \; > $origin/$matter
|
||||||
|
|
||||||
|
# Append blacklist entries if they exist
|
||||||
|
if [[ -f $blacklist ]];then
|
||||||
|
numberOf=$(cat $blacklist | wc -l | sed 's/^[ \t]*//')
|
||||||
|
echo "** Blacklisting $numberOf domain(s)..."
|
||||||
|
cat $blacklist >> /tmp/matter.txt
|
||||||
|
else
|
||||||
|
:
|
||||||
|
fi
|
||||||
|
|
||||||
|
function gravity_advanced()
|
||||||
|
###########################
|
||||||
|
{
|
||||||
|
numberOf=$(cat $origin/$andLight | wc -l | sed 's/^[ \t]*//')
|
||||||
|
echo "** $numberOf domains being pulled in by gravity..."
|
||||||
|
# Remove carriage returns and preceding whitespace
|
||||||
|
cat $origin/$andLight | sed $'s/\r$//' | sed '/^\s*$/d' > $origin/$supernova
|
||||||
|
# Sort and remove duplicates
|
||||||
|
cat $origin/$supernova | sort | uniq > $origin/$eventHorizon
|
||||||
|
numberOf=$(cat $origin/$eventHorizon | wc -l | sed 's/^[ \t]*//')
|
||||||
|
echo "** $numberOf unique domains trapped in the event horizon."
|
||||||
|
# Format domain list as "127.0.0.1 domain.com"
|
||||||
|
echo "** Formatting domains into a HOSTS file..."
|
||||||
|
cat $origin/$eventHorizon | awk '{sub(/\r$/,""); print "127.0.0.1 "$0}' > $origin/$accretionDisc
|
||||||
|
# Put the default entries at the top of the file
|
||||||
|
echo "::1 localhost" | cat - $origin/$accretionDisc > $origin/latent.$accretionDisc && mv $origin/latent.$accretionDisc $origin/$accretionDisc
|
||||||
|
echo "255.255.255.255 broadcasthost" | cat - $origin/$accretionDisc > $origin/latent.$accretionDisc && mv $origin/latent.$accretionDisc $origin/$accretionDisc
|
||||||
|
echo "127.0.0.1 localhost" | cat - $origin/$accretionDisc > $origin/latent.$accretionDisc && mv $origin/latent.$accretionDisc $origin/$accretionDisc
|
||||||
|
sudo cp $adList $adList.orig
|
||||||
|
sudo cp $origin/$accretionDisc $adList
|
||||||
|
}
|
||||||
|
|
||||||
|
# Whitelist (if applicable) then remove duplicates and format for dnsmasq
|
||||||
|
if [[ -f $whitelist ]];then
|
||||||
|
# Remove whitelist entries
|
||||||
|
numberOf=$(cat $whitelist | wc -l | sed 's/^[ \t]*//')
|
||||||
|
echo "** Whitelisting $numberOf domain(s)..."
|
||||||
|
# Append a "$" to the end of each line so it can be parsed out with grep -w
|
||||||
|
echo -n "^$" > $latentWhitelist
|
||||||
|
awk -F '[# \t]' 'NF>0&&$1!="" {print $1"$"}' $whitelist > $latentWhitelist
|
||||||
|
cat $origin/$matter | grep -vwf $latentWhitelist > $origin/$andLight
|
||||||
|
gravity_advanced
|
||||||
|
|
||||||
|
else
|
||||||
|
cat $origin/$matter > $origin/$andLight
|
||||||
|
gravity_advanced
|
||||||
fi
|
fi
|
||||||
service dnsmasq restart
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
<html>
|
|
||||||
<head>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
# /etc/lighttpd/lighttpd.conf
|
|
||||||
server.modules = (
|
|
||||||
"mod_access",
|
|
||||||
"mod_alias",
|
|
||||||
"mod_compress",
|
|
||||||
"mod_redirect",
|
|
||||||
"mod_auth",
|
|
||||||
"mod_rewrite",
|
|
||||||
)
|
|
||||||
|
|
||||||
server.document-root = "/var/www"
|
|
||||||
server.upload-dirs = ( "/var/cache/lighttpd/uploads" )
|
|
||||||
server.errorlog = "/var/log/lighttpd/error.log"
|
|
||||||
server.pid-file = "/var/run/lighttpd.pid"
|
|
||||||
server.username = "www-data"
|
|
||||||
server.groupname = "www-data"
|
|
||||||
server.port = 80
|
|
||||||
|
|
||||||
|
|
||||||
index-file.names = ( "index.php", "index.html", "index.lighttpd.html" )
|
|
||||||
url.access-deny = ( "~", ".inc" )
|
|
||||||
static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
|
|
||||||
|
|
||||||
compress.cache-dir = "/var/cache/lighttpd/compress/"
|
|
||||||
compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" )
|
|
||||||
|
|
||||||
# default listening port for IPv6 falls back to the IPv4 port
|
|
||||||
include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
|
|
||||||
include_shell "/usr/share/lighttpd/create-mime.assign.pl"
|
|
||||||
include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
|
|
||||||
|
|
||||||
# Optional if a password protected directory is desired
|
|
||||||
# See http://jacobsalmela.com/password-protect-a-lighttpd-web-server-on-a-raspberry-pi-using-mod-auth/
|
|
||||||
#auth.backend = "htdigest"
|
|
||||||
#auth.backend.htdigest.userfile = "/etc/lighttpd/.htpasswd/lighttpd-htdigest.user"
|
|
||||||
#auth.require = ( "/stream/" =>
|
|
||||||
# (
|
|
||||||
# "method" => "digest",
|
|
||||||
# "realm" => "lcars",
|
|
||||||
# "require" => "valid-user"
|
|
||||||
# ),
|
|
||||||
#)
|
|
||||||
|
|
||||||
# Rewrites all URLs to the /var/www/pihole/index.html
|
|
||||||
# This should be a blank file (for speed)
|
|
||||||
$HTTP["host"] =~ ".*" {
|
|
||||||
url.rewrite = (".*" => "pihole/index.html")
|
|
||||||
}
|
|
||||||
BIN
pihole.png
BIN
pihole.png
Binary file not shown.
|
Before Width: | Height: | Size: 68 B |
@ -1,3 +0,0 @@
|
|||||||
nameserver 192.168.1.101
|
|
||||||
nameserver 8.8.8.8
|
|
||||||
nameserver 8.8.4.4
|
|
||||||
Loading…
Reference in New Issue
Block a user