Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-25 16:50:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

MERGE FAIL :ashamed_face:

Browse source
This commit is contained in:
Promofaux 2016-10-23 22:43:11 +01:00
parent 476fd1f695
commit bd0cc134bf
1 changed files with 44 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

56
advanced/Scripts/blacklist.sh
View file

@ -35,7 +35,7 @@ basename=pihole
piholeDir=/etc/${basename} piholeDir=/etc/${basename}
adList=${piholeDir}/gravity.list adList=${piholeDir}/gravity.list
blacklist=${piholeDir}/blacklist.txt blacklist=${piholeDir}/blacklist.txt
reload=false reload=true
addmode=true addmode=true
verbose=true verbose=true
@ -58,10 +58,10 @@ PopBlacklistFile() {
touch ${blacklist} touch ${blacklist}
fi fi
for dom in "${domList[@]}"; do for dom in "${domList[@]}"; do
if "${addmode}"; then if "$addmode"; then
AddDomain "${dom}" AddDomain "$dom"
else else
RemoveDomain "${dom}" RemoveDomain "$dom"
fi fi
done done
} }
@ -75,17 +75,17 @@ AddDomain() {
if ${verbose}; then if ${verbose}; then
echo -n "::: Adding $1 to blacklist file..." echo -n "::: Adding $1 to blacklist file..."
fi fi
echo "${1}" >> ${blacklist} echo "$1" >> ${blacklist}
modifyHost=true
echo " done!" echo " done!"
else else
if ${verbose}; then if ${verbose}; then
echo "::: ${1} already exists in ${blacklist}! No need to add" echo "::: $1 already exists in $blacklist! No need to add"
fi fi
fi fi
} }
RemoveDomain() { RemoveDomain() {
bool=false bool=false
grep -Ex -q "$1" ${blacklist} || bool=true grep -Ex -q "$1" ${blacklist} || bool=true
if ${bool}; then if ${bool}; then
@ -96,41 +96,12 @@ RemoveDomain() {
else else
#Domain is in the blacklist file,remove it #Domain is in the blacklist file,remove it
if ${verbose}; then if ${verbose}; then
echo "::: Un-blacklisting ${dom}..." echo "::: Un-blacklisting $dom..."
fi fi
echo "$1" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' ${blacklist} echo "$1" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' ${blacklist}
fi fi
} }
ModifyHostFile() {
if ${addmode}; then
#add domains to the hosts file
if [[ -r ${blacklist} ]]; then
numberOf=$(cat ${blacklist} | sed '/^\s*$/d' | wc -l)
plural=; [[ "${numberOf}" != "1" ]] && plural=s
echo ":::"
echo -n "::: Modifying HOSTS file to blacklist $numberOf domain${plural}..."
if [[ -n ${piholeIPv6} ]]; then
cat ${blacklist} | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> ${adList}
else
cat ${blacklist} | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >>${adList}
fi
fi
else
echo ":::"
for dom in "${domToRemoveList[@]}"; do
#we need to remove the domains from the blacklist file and the host file
echo "::: ${dom}"
echo -n "::: removing from HOSTS file..."
echo "${dom}" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /[^.]'{}'(?!.)/;' ${adList}
echo " done!"
echo -n "::: removing from blackist.txt..."
echo "${dom}" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' ${blacklist}
echo " done!"
done
fi
}
Reload() { Reload() {
pihole -g -sd pihole -g -sd
} }
@ -139,16 +110,17 @@ DisplayBlist() {
verbose=false verbose=false
echo -e " Displaying Gravity Affected Domains \n" echo -e " Displaying Gravity Affected Domains \n"
count=1 count=1
while IFS= read -r AD; do while IFS= read -r AD
echo "${count}: ${AD}" do
echo "${count}: $AD"
count=$((count+1)) count=$((count+1))
done < "${blacklist}" done < "$blacklist"
exit 0;
} }
################################################### ###################################################
for var in "$@"; do for var in "$@"
do
case "$var" in case "$var" in
"-nr"| "--noreload" ) reload=false;; "-nr"| "--noreload" ) reload=false;;
"-d" | "--delmode" ) addmode=false;; "-d" | "--delmode" ) addmode=false;;