diff --git a/blacklists_updater.sh b/blacklists_updater.sh deleted file mode 100755 index 139c219..0000000 --- a/blacklists_updater.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -outfile_wo_comments="blacklists/blacklist.txt" -outfile_w_comments="blacklists/blacklist_with_comments.txt" - -auto_black_ass="auto/black_ass.txt" - -black_names="uvd|umvd|fgup|grchc|roskomnad|federalnaya sluzhba|ufsb|zonatelecom" -white_names="ruvds" - -grep -iE "${black_names}" auto/all-ru-asn.txt | grep -viE "${white_names}" | awk '{ print "# AS-Name: " $0 "\n" $1}' > ${auto_black_ass} -./network_list_from_as.py ${auto_black_ass} > ${outfile_w_comments} -./network_list_from_netname.py lists/ru-gov-netnames.txt >> ${outfile_w_comments} -grep -iE "${black_names}" auto/all-ru-ipv4.txt | grep -viE "${white_names}" | awk '{ print "# NET-Name: " $0 "\n" $1}' >> ${outfile_w_comments} -grep -iE "${black_names}" auto/ripe-ru-ipv4.txt | grep -viE "${white_names}" | awk '{ print "# NET-Name: " $0 "\n" $1}' >> ${outfile_w_comments} - -# Remove comments by sed to avoid flooding WHOIS servers -grep -v "#" ${outfile_w_comments} | sort | uniq > ${outfile_wo_comments} diff --git a/blacklists_updater_txt.sh b/blacklists_updater_txt.sh index 7ff0577..fdacab3 100755 --- a/blacklists_updater_txt.sh +++ b/blacklists_updater_txt.sh @@ -7,7 +7,7 @@ blacklist_v6_file="blacklists/blacklist-v6.txt" auto_black_ass="auto/black_ass.txt" -black_names="uvd|umvd|fgup|grchc|roskomnad|federalnaya sluzhba|ufsb|zonatelecom|llc vk|vkontakte|ODNOKLASSNIKI|VKCOMPANY|mail.ru|mail-ru" +black_names="uvd|umvd|fgup|grchc|roskomnad|federalnaya sluzhba|ufsb|zonatelecom|llc vk|vkontakte|ODNOKLASSNIKI|VKCOMPANY|mail.ru|mail-ru|mail_ru" white_names="ruvds" grep -iE "${black_names}" auto/all-ru-asn.txt | grep -viE "${white_names}" | awk '{ print "# AS-Name: " $0 "\n" $1}' > ${auto_black_ass}