2015-11-11 08:43:00 +00:00
|
|
|
#!/usr/bin/env bash
|
2015-11-23 10:52:12 +00:00
|
|
|
# Pi-hole: A black hole for Internet advertisements
|
2015-12-06 13:55:50 +00:00
|
|
|
# (c) 2015 by Jacob Salmela
|
2015-11-23 10:52:12 +00:00
|
|
|
# Network-wide ad blocking via your Raspberry Pi
|
2015-05-19 18:31:37 +00:00
|
|
|
# http://pi-hole.net
|
2015-11-06 23:03:55 +00:00
|
|
|
# Compiles a list of ad-serving domains by downloading them from multiple sources
|
2015-12-06 13:55:50 +00:00
|
|
|
#
|
|
|
|
# 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.
|
2015-11-26 23:48:52 +00:00
|
|
|
|
2016-01-21 22:14:55 +00:00
|
|
|
# Run this script as root or under sudo
|
2016-01-24 16:47:38 +00:00
|
|
|
echo ":::"
|
2016-04-11 10:29:14 +00:00
|
|
|
|
2016-10-15 19:02:57 +00:00
|
|
|
helpFunc()
|
2016-08-17 17:59:00 +00:00
|
|
|
{
|
|
|
|
echo "::: Pull in domains from adlists"
|
|
|
|
echo ":::"
|
|
|
|
echo "::: Usage: pihole -g"
|
|
|
|
echo ":::"
|
|
|
|
echo "::: Options:"
|
|
|
|
echo "::: -f, --force Force lists to be downloaded, even if they don't need updating."
|
|
|
|
echo "::: -h, --help Show this help dialog"
|
|
|
|
exit 1
|
|
|
|
}
|
|
|
|
|
2016-01-21 22:14:55 +00:00
|
|
|
|
2016-01-26 20:26:09 +00:00
|
|
|
adListFile=/etc/pihole/adlists.list
|
|
|
|
adListDefault=/etc/pihole/adlists.default
|
2016-03-29 05:25:40 +00:00
|
|
|
whitelistScript=/opt/pihole/whitelist.sh
|
|
|
|
blacklistScript=/opt/pihole/blacklist.sh
|
2016-10-19 22:15:05 +00:00
|
|
|
whitelistFile=/etc/pihole/whitelist.txt
|
|
|
|
blacklistFile=/etc/pihole/blacklist.txt
|
2016-01-26 20:26:09 +00:00
|
|
|
|
2016-09-16 22:05:08 +00:00
|
|
|
#Source the setupVars from install script for the IP
|
2016-10-15 19:03:33 +00:00
|
|
|
setupVars=/etc/pihole/setupVars.conf
|
|
|
|
if [[ -f ${setupVars} ]];then
|
|
|
|
. /etc/pihole/setupVars.conf
|
|
|
|
else
|
|
|
|
echo "::: WARNING: /etc/pihole/setupVars.conf missing. Possible installation failure."
|
2016-10-17 21:24:59 +00:00
|
|
|
echo "::: Please run 'pihole -r', and choose the 'reconfigure' option to reconfigure."
|
2016-10-15 19:03:33 +00:00
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2016-09-16 22:05:08 +00:00
|
|
|
#Remove the /* from the end of the IPv4addr.
|
2016-10-19 18:50:21 +00:00
|
|
|
IPv4_address=${IPv4_address%/*}
|
2016-01-01 14:11:46 +00:00
|
|
|
|
2015-05-19 18:31:37 +00:00
|
|
|
# Variables for various stages of downloading and formatting the list
|
2015-11-23 07:49:38 +00:00
|
|
|
basename=pihole
|
2016-08-19 21:51:09 +00:00
|
|
|
piholeDir=/etc/${basename}
|
|
|
|
adList=${piholeDir}/gravity.list
|
2015-11-23 07:49:38 +00:00
|
|
|
justDomainsExtension=domains
|
2016-09-16 22:05:08 +00:00
|
|
|
matterAndLight=${basename}.0.matterandlight.txt
|
2016-08-19 21:51:09 +00:00
|
|
|
supernova=${basename}.1.supernova.txt
|
2016-10-19 22:52:54 +00:00
|
|
|
preEventHorizon=list.preEventHorizon
|
|
|
|
eventHorizon=${basename}.2.supernova.txt
|
2016-08-19 21:51:09 +00:00
|
|
|
accretionDisc=${basename}.3.accretionDisc.txt
|
2014-06-08 15:03:56 +00:00
|
|
|
|
2016-10-19 21:06:19 +00:00
|
|
|
skipDownload=false
|
|
|
|
|
2016-10-15 19:09:38 +00:00
|
|
|
# Warn users still using pihole.conf that it no longer has any effect (I imagine about 2 people use it)
|
2016-08-19 21:51:09 +00:00
|
|
|
if [[ -r ${piholeDir}/pihole.conf ]];then
|
2016-10-15 19:09:38 +00:00
|
|
|
echo "::: pihole.conf file no longer supported. Over-rides in this file are ignored."
|
2015-11-06 23:03:55 +00:00
|
|
|
fi
|
2015-11-26 23:48:52 +00:00
|
|
|
|
2015-11-23 09:47:24 +00:00
|
|
|
###########################
|
|
|
|
# collapse - begin formation of pihole
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_collapse() {
|
2016-01-26 20:26:09 +00:00
|
|
|
echo "::: Neutrino emissions detected..."
|
|
|
|
echo ":::"
|
|
|
|
#Decide if we're using a custom ad block list, or defaults.
|
2016-08-19 21:51:09 +00:00
|
|
|
if [ -f ${adListFile} ]; then
|
2016-01-26 20:26:09 +00:00
|
|
|
#custom file found, use this instead of default
|
|
|
|
echo -n "::: Custom adList file detected. Reading..."
|
|
|
|
sources=()
|
2016-03-26 19:16:22 +00:00
|
|
|
while read -r line; do
|
2016-02-21 17:45:25 +00:00
|
|
|
#Do not read commented out or blank lines
|
2016-08-19 21:51:09 +00:00
|
|
|
if [[ ${line} = \#* ]] || [[ ! ${line} ]]; then
|
2016-02-21 17:45:25 +00:00
|
|
|
echo "" > /dev/null
|
|
|
|
else
|
2016-08-19 21:51:09 +00:00
|
|
|
sources+=(${line})
|
2016-02-21 17:45:25 +00:00
|
|
|
fi
|
2016-08-19 21:51:09 +00:00
|
|
|
done < ${adListFile}
|
2016-03-06 05:13:43 +00:00
|
|
|
echo " done!"
|
2016-01-26 20:26:09 +00:00
|
|
|
else
|
|
|
|
#no custom file found, use defaults!
|
|
|
|
echo -n "::: No custom adlist file detected, reading from default file..."
|
2016-04-02 00:19:47 +00:00
|
|
|
sources=()
|
2016-03-26 19:16:22 +00:00
|
|
|
while read -r line; do
|
2016-02-21 17:45:25 +00:00
|
|
|
#Do not read commented out or blank lines
|
2016-08-19 21:51:09 +00:00
|
|
|
if [[ ${line} = \#* ]] || [[ ! ${line} ]]; then
|
2016-02-21 17:45:25 +00:00
|
|
|
echo "" > /dev/null
|
|
|
|
else
|
2016-08-19 21:51:09 +00:00
|
|
|
sources+=(${line})
|
2016-02-21 17:45:25 +00:00
|
|
|
fi
|
2016-08-19 21:51:09 +00:00
|
|
|
done < ${adListDefault}
|
2016-03-06 05:13:43 +00:00
|
|
|
echo " done!"
|
|
|
|
fi
|
2015-11-23 08:36:01 +00:00
|
|
|
}
|
2015-11-23 07:49:38 +00:00
|
|
|
|
2015-11-26 23:56:37 +00:00
|
|
|
# patternCheck - check to see if curl downloaded any new files.
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_patternCheck() {
|
2015-11-26 23:48:52 +00:00
|
|
|
patternBuffer=$1
|
|
|
|
# check if the patternbuffer is a non-zero length file
|
|
|
|
if [[ -s "$patternBuffer" ]];then
|
|
|
|
# Some of the blocklists are copyright, they need to be downloaded
|
|
|
|
# and stored as is. They can be processed for content after they
|
|
|
|
# have been saved.
|
2016-10-19 22:57:43 +00:00
|
|
|
mv "$patternBuffer" "$saveLocation"
|
2016-01-24 15:25:24 +00:00
|
|
|
echo " List updated, transport successful!"
|
2015-11-26 23:48:52 +00:00
|
|
|
else
|
|
|
|
# curl didn't download any host files, probably because of the date check
|
2016-01-24 15:25:24 +00:00
|
|
|
echo " No changes detected, transport skipped!"
|
2015-11-26 23:48:52 +00:00
|
|
|
fi
|
2015-11-23 10:52:12 +00:00
|
|
|
}
|
|
|
|
|
2015-11-26 23:56:37 +00:00
|
|
|
# transport - curl the specified url with any needed command extentions
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_transport() {
|
2015-11-26 23:48:52 +00:00
|
|
|
url=$1
|
|
|
|
cmd_ext=$2
|
|
|
|
agent=$3
|
2015-12-05 03:41:37 +00:00
|
|
|
|
2015-11-26 23:48:52 +00:00
|
|
|
# tmp file, so we don't have to store the (long!) lists in RAM
|
|
|
|
patternBuffer=$(mktemp)
|
|
|
|
heisenbergCompensator=""
|
2016-08-19 21:51:09 +00:00
|
|
|
if [[ -r ${saveLocation} ]]; then
|
2015-11-26 23:48:52 +00:00
|
|
|
# if domain has been saved, add file for date check to only download newer
|
|
|
|
heisenbergCompensator="-z $saveLocation"
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Silently curl url
|
2016-08-19 21:51:09 +00:00
|
|
|
curl -s -L ${cmd_ext} ${heisenbergCompensator} -A "$agent" ${url} > ${patternBuffer}
|
2015-11-26 23:48:52 +00:00
|
|
|
# Check for list updates
|
2016-03-26 19:16:22 +00:00
|
|
|
gravity_patternCheck "$patternBuffer"
|
2015-11-23 10:52:12 +00:00
|
|
|
}
|
2015-11-26 23:48:52 +00:00
|
|
|
|
2015-11-23 09:47:24 +00:00
|
|
|
# spinup - main gravity function
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_spinup() {
|
2016-04-04 05:59:24 +00:00
|
|
|
echo ":::"
|
2015-11-26 23:56:37 +00:00
|
|
|
# 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
|
2015-11-23 09:47:24 +00:00
|
|
|
url=${sources[$i]}
|
|
|
|
# Get just the domain from the URL
|
2015-11-23 10:52:12 +00:00
|
|
|
domain=$(echo "$url" | cut -d'/' -f3)
|
|
|
|
|
|
|
|
# Save the file as list.#.domain
|
2016-08-19 21:51:09 +00:00
|
|
|
saveLocation=${piholeDir}/list.${i}.${domain}.${justDomainsExtension}
|
|
|
|
activeDomains[$i]=${saveLocation}
|
2015-11-23 10:52:12 +00:00
|
|
|
|
|
|
|
agent="Mozilla/10.0"
|
|
|
|
|
2016-10-19 21:06:19 +00:00
|
|
|
|
2015-11-23 10:52:12 +00:00
|
|
|
|
|
|
|
# Use a case statement to download lists that need special cURL commands
|
|
|
|
# to complete properly and reset the user agent when required
|
|
|
|
case "$domain" in
|
2016-04-02 00:19:47 +00:00
|
|
|
"adblock.mahakala.is")
|
2016-06-25 13:00:49 +00:00
|
|
|
agent='Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36'
|
2016-04-02 00:19:47 +00:00
|
|
|
cmd_ext="-e http://forum.xda-developers.com/"
|
|
|
|
;;
|
2015-11-23 10:52:12 +00:00
|
|
|
|
2016-04-02 00:19:47 +00:00
|
|
|
"pgl.yoyo.org")
|
|
|
|
cmd_ext="-d mimetype=plaintext -d hostformat=hosts"
|
|
|
|
;;
|
2015-11-23 10:52:12 +00:00
|
|
|
|
2016-04-02 00:19:47 +00:00
|
|
|
# Default is a simple request
|
|
|
|
*) cmd_ext=""
|
2015-11-23 10:52:12 +00:00
|
|
|
esac
|
2016-10-19 21:06:19 +00:00
|
|
|
if [[ "${skipDownload}" == false ]]; then
|
|
|
|
echo -n "::: Getting $domain list..."
|
|
|
|
gravity_transport "$url" "$cmd_ext" "$agent"
|
|
|
|
fi
|
2015-11-26 23:56:37 +00:00
|
|
|
done
|
2015-11-23 10:52:12 +00:00
|
|
|
}
|
2014-06-08 15:03:56 +00:00
|
|
|
|
2015-11-23 11:26:10 +00:00
|
|
|
# Schwarzchild - aggregate domains to one list and add blacklisted domains
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_Schwarzchild() {
|
2016-04-02 00:19:47 +00:00
|
|
|
echo "::: "
|
2015-11-26 23:48:52 +00:00
|
|
|
# Find all active domains and compile them into one file and remove CRs
|
2016-01-24 15:25:24 +00:00
|
|
|
echo -n "::: Aggregating list of domains..."
|
2016-09-16 22:05:08 +00:00
|
|
|
truncate -s 0 ${piholeDir}/${matterAndLight}
|
2015-11-26 23:48:52 +00:00
|
|
|
for i in "${activeDomains[@]}"
|
2015-12-05 03:41:37 +00:00
|
|
|
do
|
2016-09-16 22:05:08 +00:00
|
|
|
cat "$i" | tr -d '\r' >> ${piholeDir}/${matterAndLight}
|
2015-11-26 23:48:52 +00:00
|
|
|
done
|
2016-01-24 15:25:24 +00:00
|
|
|
echo " done!"
|
2015-11-26 23:48:52 +00:00
|
|
|
}
|
2015-05-19 18:31:37 +00:00
|
|
|
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_Blacklist(){
|
2015-11-26 23:48:52 +00:00
|
|
|
# Append blacklist entries if they exist
|
2016-10-19 22:15:05 +00:00
|
|
|
numBlacklisted=$(wc -l < "${blacklistFile}")
|
2016-01-24 15:25:24 +00:00
|
|
|
plural=; [[ "$numBlacklisted" != "1" ]] && plural=s
|
2016-10-19 22:15:05 +00:00
|
|
|
|
|
|
|
echo -n "::: BlackListing $numBlacklisted domain${plural}..."
|
|
|
|
cat ${blacklistFile} >> ${piholeDir}/${eventHorizon}
|
|
|
|
echo " done!"
|
2016-01-15 14:49:16 +00:00
|
|
|
}
|
2015-11-06 23:03:55 +00:00
|
|
|
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_Whitelist() {
|
2016-10-19 22:15:05 +00:00
|
|
|
#${piholeDir}/${eventHorizon})
|
2016-04-02 00:19:47 +00:00
|
|
|
echo ":::"
|
2015-11-26 23:48:52 +00:00
|
|
|
# Prevent our sources from being pulled into the hole
|
2016-01-15 14:49:16 +00:00
|
|
|
plural=; [[ "${sources[@]}" != "1" ]] && plural=s
|
2016-10-19 22:15:05 +00:00
|
|
|
echo -n "::: Adding adlist source${plural} to the whitelist..."
|
2016-03-06 05:13:43 +00:00
|
|
|
|
2016-01-15 14:49:16 +00:00
|
|
|
urls=()
|
2016-03-26 19:16:22 +00:00
|
|
|
for url in "${sources[@]}"
|
2015-11-26 23:48:52 +00:00
|
|
|
do
|
2016-01-15 15:54:11 +00:00
|
|
|
tmp=$(echo "$url" | awk -F '/' '{print $3}')
|
2016-08-19 21:51:09 +00:00
|
|
|
urls=("${urls[@]}" ${tmp})
|
2016-01-24 22:30:12 +00:00
|
|
|
done
|
2016-01-24 15:25:24 +00:00
|
|
|
echo " done!"
|
2016-03-06 05:13:43 +00:00
|
|
|
|
2016-10-19 22:15:05 +00:00
|
|
|
# Ensure adlist domains are in whitelist.txt
|
|
|
|
${whitelistScript} -nr -q "${urls[@]}" > /dev/null
|
|
|
|
|
|
|
|
# Remove anything in whitelist.txt from the Event Horizon
|
|
|
|
numWhitelisted=$(wc -l < "${whitelistFile}")
|
2016-01-24 15:25:24 +00:00
|
|
|
plural=; [[ "$numWhitelisted" != "1" ]] && plural=s
|
2016-10-19 22:15:05 +00:00
|
|
|
echo -n "::: Whitelisting $numWhitelisted domain${plural}..."
|
2016-10-19 22:52:54 +00:00
|
|
|
grep -F -x -v -f ${whitelistFile} ${piholeDir}/${preEventHorizon} > ${piholeDir}/${eventHorizon}
|
2016-10-19 22:15:05 +00:00
|
|
|
echo " done!"
|
2015-11-23 09:16:00 +00:00
|
|
|
}
|
|
|
|
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_unique() {
|
2015-11-26 23:56:37 +00:00
|
|
|
# Sort and remove duplicates
|
2016-01-24 15:25:24 +00:00
|
|
|
echo -n "::: Removing duplicate domains...."
|
2016-10-19 22:52:54 +00:00
|
|
|
sort -u ${piholeDir}/${supernova} > ${piholeDir}/${preEventHorizon}
|
2016-01-24 15:25:24 +00:00
|
|
|
echo " done!"
|
2016-10-19 22:52:54 +00:00
|
|
|
numberOf=$(wc -l < ${piholeDir}/${preEventHorizon})
|
2016-01-24 15:25:24 +00:00
|
|
|
echo "::: $numberOf unique domains trapped in the event horizon."
|
2015-11-23 11:11:16 +00:00
|
|
|
}
|
2015-11-26 23:48:52 +00:00
|
|
|
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_hostFormat() {
|
2016-04-02 00:19:47 +00:00
|
|
|
# Format domain list as "192.168.x.x domain.com"
|
2016-01-24 15:25:24 +00:00
|
|
|
echo "::: Formatting domains into a HOSTS file..."
|
2016-09-08 02:38:44 +00:00
|
|
|
if [[ -f /etc/hostname ]]; then
|
|
|
|
hostname=$(</etc/hostname)
|
|
|
|
elif [ -x "$(command -v hostname)" ]; then
|
|
|
|
hostname=$(hostname -f)
|
|
|
|
else
|
|
|
|
echo "::: Error: Unable to determine fully qualified domain name of host"
|
|
|
|
fi
|
2016-10-19 18:50:21 +00:00
|
|
|
|
|
|
|
# Check vars from setupVars.conf to see if we're using IPv4, IPv6, Or both.
|
2016-10-19 18:51:32 +00:00
|
|
|
if [[ -n "${IPv4_address}" && -n "${IPv6_address}" ]];then
|
2016-10-19 18:50:21 +00:00
|
|
|
|
|
|
|
# Both IPv4 and IPv6
|
2016-10-19 18:51:32 +00:00
|
|
|
echo -e "$IPv4_address $hostname\n$IPv6_address $hostname\n$IPv4_address pi.hole\n$IPv6_address pi.hole" > ${piholeDir}/${accretionDisc}
|
|
|
|
cat ${piholeDir}/${eventHorizon} | awk -v ipv4addr="$IPv4_address" -v ipv6addr="$IPv6_address" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> ${piholeDir}/${accretionDisc}
|
2016-10-19 18:50:21 +00:00
|
|
|
|
|
|
|
elif [[ -n "${IPv4_address}" && -z "${IPv6_address}" ]];then
|
|
|
|
|
|
|
|
# Only IPv4
|
2016-10-19 19:03:29 +00:00
|
|
|
echo -e "$IPv4_address $hostname\n$IPv4_address pi.hole" > ${piholeDir}/${accretionDisc}
|
2016-10-19 18:51:32 +00:00
|
|
|
cat ${piholeDir}/${eventHorizon} | awk -v ipv4addr="$IPv4_address" '{sub(/\r$/,""); print ipv4addr" "$0}' >> ${piholeDir}/${accretionDisc}
|
2016-10-19 18:50:21 +00:00
|
|
|
|
|
|
|
elif [[ -z "${IPv4_address}" && -n "${IPv6_address}" ]];then
|
|
|
|
|
|
|
|
# Only IPv6
|
|
|
|
echo -e "$IPv6_address $hostname\n$IPv6_address pi.hole" > ${piholeDir}/${accretionDisc}
|
2016-10-19 18:51:32 +00:00
|
|
|
cat ${piholeDir}/${eventHorizon} | awk -v ipv6addr="$IPv6_address" '{sub(/\r$/,""); print ipv6addr" "$0}' >> ${piholeDir}/${accretionDisc}
|
2016-10-19 18:50:21 +00:00
|
|
|
|
|
|
|
elif [[ -z "${IPv4_address}" && -z "${IPv6_address}" ]];then
|
|
|
|
echo "::: No IP Values found! Please run 'pihole -r' and choose reconfigure to restore values"
|
2016-10-19 18:51:32 +00:00
|
|
|
exit 1
|
2016-10-19 18:50:21 +00:00
|
|
|
fi
|
2016-04-02 00:19:47 +00:00
|
|
|
|
2015-11-26 23:56:37 +00:00
|
|
|
# Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
|
2016-08-19 21:51:09 +00:00
|
|
|
cp ${piholeDir}/${accretionDisc} ${adList}
|
2015-11-23 11:11:16 +00:00
|
|
|
}
|
2015-11-26 23:48:52 +00:00
|
|
|
|
2015-11-26 23:56:37 +00:00
|
|
|
# blackbody - remove any remnant files from script processes
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_blackbody() {
|
2015-12-05 03:41:37 +00:00
|
|
|
# Loop through list files
|
2016-08-19 21:51:09 +00:00
|
|
|
for file in ${piholeDir}/*.${justDomainsExtension}
|
2015-11-26 23:48:52 +00:00
|
|
|
do
|
2015-11-26 23:56:37 +00:00
|
|
|
# If list is in active array then leave it (noop) else rm the list
|
2016-03-26 19:16:22 +00:00
|
|
|
if [[ " ${activeDomains[@]} " =~ ${file} ]]; then
|
2015-11-26 23:48:52 +00:00
|
|
|
:
|
|
|
|
else
|
2016-03-26 19:16:22 +00:00
|
|
|
rm -f "$file"
|
2015-11-26 23:48:52 +00:00
|
|
|
fi
|
|
|
|
done
|
2015-11-26 03:51:07 +00:00
|
|
|
}
|
2015-11-23 07:49:38 +00:00
|
|
|
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_advanced() {
|
2015-11-26 23:56:37 +00:00
|
|
|
# Remove comments and print only the domain name
|
|
|
|
# Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious
|
|
|
|
# This helps with that and makes it easier to read
|
|
|
|
# It also helps with debugging so each stage of the script can be researched more in depth
|
2016-01-24 15:25:24 +00:00
|
|
|
echo -n "::: Formatting list of domains to remove comments...."
|
2016-09-26 10:58:07 +00:00
|
|
|
#awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' ${piholeDir}/${matterAndLight} | sed -nr -e 's/\.{2,}/./g' -e '/\./p' > ${piholeDir}/${supernova}
|
|
|
|
#Above line does not correctly grab domains where comment is on the same line (e.g 'addomain.com #comment')
|
|
|
|
#Add additional awk command to read all lines up to a '#', and then continue as we were
|
|
|
|
cat ${piholeDir}/${matterAndLight} | awk -F'#' '{print $1}' | awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' | sed -nr -e 's/\.{2,}/./g' -e '/\./p' > ${piholeDir}/${supernova}
|
2016-04-02 00:19:47 +00:00
|
|
|
echo " done!"
|
2016-03-06 05:13:43 +00:00
|
|
|
|
2016-08-19 21:51:09 +00:00
|
|
|
numberOf=$(wc -l < ${piholeDir}/${supernova})
|
2016-01-24 15:25:24 +00:00
|
|
|
echo "::: $numberOf domains being pulled in by gravity..."
|
2016-03-06 05:13:43 +00:00
|
|
|
|
2015-11-26 23:56:37 +00:00
|
|
|
gravity_unique
|
2015-12-26 18:37:51 +00:00
|
|
|
}
|
2015-12-05 03:41:37 +00:00
|
|
|
|
2016-10-15 19:02:57 +00:00
|
|
|
gravity_reload() {
|
2016-02-21 20:45:56 +00:00
|
|
|
#Clear no longer needed files...
|
|
|
|
echo ":::"
|
|
|
|
echo -n "::: Cleaning up un-needed files..."
|
2016-10-15 17:42:53 +00:00
|
|
|
rm ${piholeDir}/pihole.*.txt
|
2016-02-21 20:45:56 +00:00
|
|
|
echo " done!"
|
2016-03-06 05:13:43 +00:00
|
|
|
|
2015-12-26 18:37:51 +00:00
|
|
|
# Reload hosts file
|
2016-01-24 15:25:24 +00:00
|
|
|
echo ":::"
|
2016-10-20 13:09:35 +00:00
|
|
|
echo "::: Refresh lists in dnsmasq..."
|
2016-10-19 21:06:19 +00:00
|
|
|
|
2016-04-04 22:38:46 +00:00
|
|
|
#ensure /etc/dnsmasq.d/01-pihole.conf is pointing at the correct list!
|
|
|
|
#First escape forward slashes in the path:
|
|
|
|
adList=${adList//\//\\\/}
|
|
|
|
#Now replace the line in dnsmasq file
|
2016-10-20 14:09:23 +00:00
|
|
|
<<<<<<< HEAD
|
2016-10-20 12:45:20 +00:00
|
|
|
# sed -i "s/^addn-hosts.*/addn-hosts=$adList/" /etc/dnsmasq.d/01-pihole.conf
|
2016-01-02 00:34:33 +00:00
|
|
|
|
2016-10-20 14:09:23 +00:00
|
|
|
=======
|
|
|
|
sed -i "s/^addn-hosts.*/addn-hosts=$adList/" /etc/dnsmasq.d/01-pihole.conf
|
|
|
|
>>>>>>> upstream/promoTweaksTheSecond
|
2016-01-02 00:34:33 +00:00
|
|
|
|
2016-10-20 13:40:45 +00:00
|
|
|
pihole restartdns
|
2015-11-06 02:11:34 +00:00
|
|
|
}
|
2015-08-23 04:44:41 +00:00
|
|
|
|
2016-08-17 18:08:55 +00:00
|
|
|
for var in "$@"
|
|
|
|
do
|
|
|
|
case "$var" in
|
2016-08-19 22:06:56 +00:00
|
|
|
"-f" | "--force" ) forceGrav=true;;
|
2016-08-17 18:08:55 +00:00
|
|
|
"-h" | "--help" ) helpFunc;;
|
2016-10-19 21:06:19 +00:00
|
|
|
"-sd" | "--skip-download" ) skipDownload=true;;
|
2016-08-17 18:08:55 +00:00
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
2016-10-19 21:06:19 +00:00
|
|
|
if [[ "${forceGrav}" == true ]]; then
|
2016-08-17 18:08:55 +00:00
|
|
|
echo -n "::: Deleting exising list cache..."
|
2016-10-15 17:42:53 +00:00
|
|
|
rm /etc/pihole/list.*
|
2016-08-17 18:08:55 +00:00
|
|
|
echo " done!"
|
|
|
|
fi
|
|
|
|
|
2016-09-16 22:05:08 +00:00
|
|
|
#Overwrite adlists.default from /etc/.pihole in case any changes have been made. Changes should be saved in /etc/adlists.list
|
2016-10-15 17:42:53 +00:00
|
|
|
cp /etc/.pihole/adlists.default /etc/pihole/adlists.default
|
2015-11-23 20:39:47 +00:00
|
|
|
gravity_collapse
|
2015-11-23 08:36:01 +00:00
|
|
|
gravity_spinup
|
2016-10-19 22:52:54 +00:00
|
|
|
if [[ "${skipDownload}" == false ]]; then
|
|
|
|
gravity_Schwarzchild
|
|
|
|
gravity_advanced
|
|
|
|
else
|
|
|
|
echo "::: Using cached Event Horizon list..."
|
|
|
|
numberOf=$(wc -l < ${piholeDir}/${preEventHorizon})
|
|
|
|
echo "::: $numberOf unique domains trapped in the event horizon."
|
|
|
|
fi
|
2016-01-15 14:49:16 +00:00
|
|
|
gravity_Whitelist
|
|
|
|
gravity_Blacklist
|
2016-10-19 22:15:05 +00:00
|
|
|
|
|
|
|
gravity_hostFormat
|
|
|
|
gravity_blackbody
|
|
|
|
|
2015-12-26 18:37:51 +00:00
|
|
|
gravity_reload
|
2016-10-20 13:03:20 +00:00
|
|
|
pihole status
|