From 75f613af8546de93c83cadbe483c1b0973b12b7f Mon Sep 17 00:00:00 2001 From: ValdikSS Date: Fri, 13 Aug 2021 14:40:40 +0300 Subject: [PATCH] Revert "Remove all excludes for deviantart.com" This reverts commit fea3278d7e9f89e685a42308452161c1211c1366. --- config/exclude-regexp-dist.awk | 1 + generate-pac.sh | 2 +- scripts/getzones.awk | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/exclude-regexp-dist.awk b/config/exclude-regexp-dist.awk index 7614994..f650c4c 100644 --- a/config/exclude-regexp-dist.awk +++ b/config/exclude-regexp-dist.awk @@ -151,6 +151,7 @@ /seedbanda/ {next} #/gidonline/ {next} /^alco/ {next} +/^www\.deviantart\.com$/ {next} (/\.r\.cloudfront\.net/) {next} (/\*/) {next} (/\\/) {next} diff --git a/generate-pac.sh b/generate-pac.sh index 0331d69..224b041 100755 --- a/generate-pac.sh +++ b/generate-pac.sh @@ -65,7 +65,7 @@ echo " if (domains.length < 10) return \"DIRECT\"; // list is broken } var shost; - if (/\.(ru|co|cu|com|info|net|org|gov|edu|int|mil|biz|pp|ne|msk|spb|nnov|od|in|ho|cc|dn|i|tut|v|dp|sl|ddns|dyndns|livejournal|herokuapp|azurewebsites|cloudfront|ucoz|3dn|nov|linode|amazonaws|sl-reverse|kiev|beget|kirov|akadns|scaleway|fastly|hldns|appspot|my1|hwcdn|wixmp|netdna-ssl|brightcove|berlogovo|edgecastcdn|trafficmanager|iwara|pximg|github)\.[^.]+$/.test(host)) + if (/\.(ru|co|cu|com|info|net|org|gov|edu|int|mil|biz|pp|ne|msk|spb|nnov|od|in|ho|cc|dn|i|tut|v|dp|sl|ddns|dyndns|livejournal|herokuapp|azurewebsites|cloudfront|ucoz|3dn|nov|linode|amazonaws|sl-reverse|kiev|beget|kirov|akadns|scaleway|fastly|hldns|appspot|my1|hwcdn|deviantart|wixmp|netdna-ssl|brightcove|berlogovo|edgecastcdn|trafficmanager|iwara|pximg|github)\.[^.]+$/.test(host)) shost = host; else shost = host.replace(/(.+)\.([^.]+\.[^.]+$)/, \"\$2\"); diff --git a/scripts/getzones.awk b/scripts/getzones.awk index 9f7c9a8..9f60cb1 100644 --- a/scripts/getzones.awk +++ b/scripts/getzones.awk @@ -17,7 +17,7 @@ {sub(/\.$/, "", $1)} { - if (!(/\.(ru|co|cu|com|info|net|org|gov|edu|int|mil|biz|pp|ne|msk|spb|nnov|od|in|ho|cc|dn|i|tut|v|dp|sl|ddns|dyndns|livejournal|herokuapp|azurewebsites|cloudfront|ucoz|3dn|nov|linode|amazonaws|sl-reverse|kiev|beget|kirov|akadns|scaleway|fastly|hldns|appspot|my1|hwcdn|wixmp|netdna-ssl|brightcove|berlogovo|edgecastcdn|trafficmanager|iwara|pximg|github)\.[^.]+$/)) + if (!(/\.(ru|co|cu|com|info|net|org|gov|edu|int|mil|biz|pp|ne|msk|spb|nnov|od|in|ho|cc|dn|i|tut|v|dp|sl|ddns|dyndns|livejournal|herokuapp|azurewebsites|cloudfront|ucoz|3dn|nov|linode|amazonaws|sl-reverse|kiev|beget|kirov|akadns|scaleway|fastly|hldns|appspot|my1|hwcdn|deviantart|wixmp|netdna-ssl|brightcove|berlogovo|edgecastcdn|trafficmanager|iwara|pximg|github)\.[^.]+$/)) {$1 = gensub(/(.+)\.([^.]+\.[^.]+$)/, "\\2", 1)} }