From c150c9535ebf9e75dfd706b3c70014cf28f17ad2 Mon Sep 17 00:00:00 2001 From: ValdikSS Date: Sat, 8 Feb 2025 18:00:58 +0300 Subject: [PATCH] Parse: always force-include custom hosts to the list, regardless of reachability --- parse.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parse.sh b/parse.sh index 9de9bc5..68b656e 100755 --- a/parse.sh +++ b/parse.sh @@ -22,13 +22,13 @@ sort -u temp/include-hosts.txt result/hostlist_original.txt > temp/hostlist_orig awk -F ';' '{split($1, a, /\|/); for (i in a) {print a[i]";"$2}}' temp/list.csv | \ grep -f config/exclude-hosts-by-ips-dist.txt | awk -F ';' '{print $2}' >> temp/exclude-hosts.txt -awk -f scripts/getzones.awk temp/hostlist_original_with_include.txt | grep -v -F -x -f temp/exclude-hosts.txt | sort -u > result/hostlist_zones.txt +awk -f scripts/getzones.awk temp/hostlist_original_with_include.txt | grep -v -F -x -f temp/exclude-hosts.txt | cat - temp/include-hosts.txt | sort -u > result/hostlist_zones.txt if [[ "$RESOLVE_NXDOMAIN" == "yes" ]]; then timeout 2h scripts/resolve-dns-nxdomain.py result/hostlist_zones.txt > temp/nxdomain-exclude-hosts.txt cat temp/nxdomain-exclude-hosts.txt >> temp/exclude-hosts.txt - awk -f scripts/getzones.awk temp/hostlist_original_with_include.txt | grep -v -F -x -f temp/exclude-hosts.txt | sort -u > result/hostlist_zones.txt + awk -f scripts/getzones.awk temp/hostlist_original_with_include.txt | grep -v -F -x -f temp/exclude-hosts.txt | cat - temp/include-hosts.txt | sort -u > result/hostlist_zones.txt fi # Generate a list of IP addresses