From f22f3ade098351f483a3597bea9e8c65b6ff6e61 Mon Sep 17 00:00:00 2001 From: ValdikSS Date: Mon, 28 Mar 2022 12:41:43 +0300 Subject: [PATCH] Remove iwara.tv from a special list See https://ntc.party/t/topic/668/22 --- generate-pac.sh | 2 +- scripts/getzones.awk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generate-pac.sh b/generate-pac.sh index de5b200..e41587b 100755 --- a/generate-pac.sh +++ b/generate-pac.sh @@ -67,7 +67,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|deviantart|wixmp|netdna-ssl|brightcove|berlogovo|edgecastcdn|trafficmanager|iwara|pximg|github|hopto|u-stream|google)\.[^.]+$/.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|pximg|github|hopto|u-stream|google)\.[^.]+$/.test(host)) shost = host.replace(/(.+)\.([^.]+\.[^.]+\.[^.]+$)/, \"\$2\"); else shost = host.replace(/(.+)\.([^.]+\.[^.]+$)/, \"\$2\"); diff --git a/scripts/getzones.awk b/scripts/getzones.awk index 988f0fb..ee5dbc5 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|deviantart|wixmp|netdna-ssl|brightcove|berlogovo|edgecastcdn|trafficmanager|iwara|pximg|github|hopto|u-stream|google)\.[^.]+$/) + 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|pximg|github|hopto|u-stream|google)\.[^.]+$/) {$1 = gensub(/(.+)\.([^.]+\.[^.]+\.[^.]+$)/, "\\2", 1)} else {$1 = gensub(/(.+)\.([^.]+\.[^.]+$)/, "\\2", 1)}