diff --git a/filters/adservers-all.txt b/filters/adservers-all.txt index 6dd6914da..9d0e901e7 100644 --- a/filters/adservers-all.txt +++ b/filters/adservers-all.txt @@ -1,5 +1,5 @@ ! Title: hostsVN -! Last modified: 01 Nov 2019 22:38 UTC+7 +! Last modified: 01 Nov 2019 22:47 UTC+7 ! Blocked: 5,709 rules ! The section containing the list contains all ad networks and tracking ! diff --git a/filters/adservers.txt b/filters/adservers.txt index 1f6e1e163..16bd30afd 100644 --- a/filters/adservers.txt +++ b/filters/adservers.txt @@ -1,5 +1,5 @@ ! Title: hostsVN -! Last modified: 01 Nov 2019 22:38 UTC+7 +! Last modified: 01 Nov 2019 22:47 UTC+7 ! Blocked: 267 rules ! The section contains a list of advertising and tracking networks in Vietnam ! diff --git a/filters/domain-adservers-all.txt b/filters/domain-adservers-all.txt index 31e26da94..385a0d7dc 100644 --- a/filters/domain-adservers-all.txt +++ b/filters/domain-adservers-all.txt @@ -1,5 +1,5 @@ ! Title: hostsVN -! Last modified: 01 Nov 2019 22:38 UTC+7 +! Last modified: 01 Nov 2019 22:47 UTC+7 ! Blocked: 5,709 rules ! The section containing the list contains all ad networks and tracking ! diff --git a/hosts b/hosts index 66b3aa227..28f896d84 100644 --- a/hosts +++ b/hosts @@ -1,5 +1,5 @@ # Title: hostsVN -# Last modified: 01 Nov 2019 22:38 UTC+7 +# Last modified: 01 Nov 2019 22:47 UTC+7 # Blocked: 18,766 domains # Please report any ads or problems by github # Home: https://bigdargon.github.io/hostsVN/ diff --git a/makefile.sh b/makefile.sh index 65719192a..bddb8b524 100644 --- a/makefile.sh +++ b/makefile.sh @@ -48,14 +48,14 @@ cat tmp/adservers.tmp tmp/adservers-all.tmp | awk '{print "DOMAIN-SUFFIX,"$1}' > # create rewrite cat source/config-rewrite.txt | grep -v '#' | grep -v -e '^[[:space:]]*$' | awk '{print $1}' > option/hostsVN-quantumult-rejection.conf -cat source/config-rewrite.txt | grep -v '#' | grep -v -e '^[[:space:]]*$' | awk '{print $1" - reject"}' >> tmp/rewrite-surge.tmp -cat source/config-rewrite.txt | grep -v '#' | grep -v -e '^[[:space:]]*$' | awk '{print $1" url reject-img"}' >> tmp/rewrite-quantumultX.tmp +cat source/config-rewrite.txt | grep -v '#' | grep -v -e '^[[:space:]]*$' | awk '{print $1" - reject"}' > tmp/rewrite-surge.tmp +cat source/config-rewrite.txt | grep -v '#' | grep -v -e '^[[:space:]]*$' | awk '{print $1" url reject-img"}' > option/hostsVN-quantumultX-rewrite.conf # create config HOSTNAME=$(cat source/config-hostname.txt) -sed -e "s/!_hostname_/$HOSTNAME/g" -e '/!_rewrite_surge_/r tmp/rewrite-surge.tmp' -e '/!_rewrite_surge_/d' tmp/title-config-surge.txt > tmp/title-config-surge.tmp -sed -e "s/!_hostname_/$HOSTNAME/g" -e '/!_rewrite_quantumultX_/r tmp/rewrite-quantumultX.tmp' -e '/!_rewrite_quantumultX_/d' tmp/title-config-quantumultX.txt > option/hostsVN-quantumultX.conf +sed -e "s/!_hostname_/$HOSTNAME/g" tmp/title-config-quantumultX.txt > option/hostsVN-quantumultX.conf sed -e "s/!_hostname_/$HOSTNAME/g" -e '/!_rejection_quantumult_/r option/hostsVN-quantumult-rejection.conf' -e '/!_rejection_quantumult_/d' -e '/!_rule_quantumult_/r option/hostsVN-quantumult-rule.conf' -e '/!_rule_quantumult_/d' tmp/title-config-quantumult.txt > option/hostsVN-quantumult.conf +sed -e "s/!_hostname_/$HOSTNAME/g" -e '/!_rewrite_surge_/r tmp/rewrite-surge.tmp' -e '/!_rewrite_surge_/d' tmp/title-config-surge.txt > tmp/title-config-surge.tmp echo "Adding to file..." diff --git a/option/hosts-VN b/option/hosts-VN index 634b6894f..8c7f0a4df 100644 --- a/option/hosts-VN +++ b/option/hosts-VN @@ -1,5 +1,5 @@ # Title: hostsVN -# Last modified: 01 Nov 2019 22:38 UTC+7 +# Last modified: 01 Nov 2019 22:47 UTC+7 # Blocked: 1,120 domains # Only include advertisers in Vietnam # Home: https://bigdargon.github.io/hostsVN/ diff --git a/option/hosts-iOS b/option/hosts-iOS index 8f48e9d8d..2b1ef63df 100644 --- a/option/hosts-iOS +++ b/option/hosts-iOS @@ -1,5 +1,5 @@ # Title: hostsVN -# Last modified: 01 Nov 2019 22:38 UTC+7 +# Last modified: 01 Nov 2019 22:47 UTC+7 # Blocked: 18,766 domains # Minimal version for iOS. Please report any ads or problems by github # Home: https://bigdargon.github.io/hostsVN/ diff --git a/option/hostsVN-quantumultX-rewrite.conf b/option/hostsVN-quantumultX-rewrite.conf new file mode 100644 index 000000000..6f4cb0fb4 --- /dev/null +++ b/option/hostsVN-quantumultX-rewrite.conf @@ -0,0 +1,43 @@ +^https?:\/\/(\w+\.)?(ads|adserver|uniad|ad-|pagead|adformat|log\w?|tj|tongji|analysis|stat|stats|statis|trace|track|tracking|click)\.\w+\.(com|cn|org|info|io|net|vn) url reject-img +^http?://ocsp.apple.com/* url reject-img +^https?://graph.facebook.com/network_ads_common/* url reject-img +^https?://graph.facebook.com/.+activities url reject-img +^https?://graph.facebook.com/.+advertiser_id=* url reject-img +^https?://www.facebook.com/adnw_logging/* url reject-img +^https?://graph.nhaccuatui.com/.+advs/* url reject-img +^https?://graph.nhaccuatui.com/.+logs/* url reject-img +^https?://graph.nhaccuatui.com/.+3g-get-info url reject-img +^https?://graph.nhaccuatui.com/.+deviceinfo url reject-img +^https?://graph.nhaccuatui.com/.+notify-firebase url reject-img +^https?://avatar-nct.nixcdn.com/.+popup url reject-img +^https?://spclient.wg.spotify.com/ad-logic/* url reject-img +^https?://spclient.wg.spotify.com/ads/* url reject-img +^https?://spclient.wg.spotify.com/.+ad_slot url reject-img +^https?://spclient.wg.spotify.com/.+banners url reject-img +^https?://spclient.wg.spotify.com/.+canvases url reject-img +^https?://spclient.wg.spotify.com/.+crashlytics url reject-img +^https?://spclient.wg.spotify.com/.+doubleclick.net url reject-img +^https?://spclient.wg.spotify.com/.+enabled-tracks url reject-img +^https?://spclient.wg.spotify.com/.+event url reject-img +^https?://spclient.wg.spotify.com/.+promoted_offer url reject-img +^https?:\/\/.+\.googlevideo\.com\/.+&oad url reject-img +^https?:\/\/.+\.googlevideo\.com\/.+&owc url reject-img +!^https?:\/\/.+\.googlevideo\.com\/.+ctier url reject-img +^https?:\/\/.+\.googlevideo\.com\/ptracking\?pltype=adhost url reject-img +^https?:\/\/.+\.googlevideo\.com\/videogoodput\? url reject-img +^https?:\/\/.+\.youtube\.com\/.+get_ads url reject-img +^https?:\/\/.+\.youtube\.com\/api\/stats\/.+adformat url reject-img +^https?:\/\/.+\.youtube\.com\/api\/stats\/ads url reject-img +^https?:\/\/.+\.youtube\.com\/error_204 url reject-img +^https?:\/\/.+\.youtube\.com\/get_midroll url reject-img +^https?:\/\/.+\.youtube\.com\/pagead\/* url reject-img +^https?:\/\/.+\.youtube\.com\/ptracking\? url reject-img +^https?:\/\/play.googleapis.com/log* url reject-img +^https?:\/\/www.googleapis.com/adsmeasurement/* url reject-img +^https?:\/\/youtubei.googleapis.com/youtubei/.+ad_ url reject-img +^https?:\/\/youtubei.googleapis.com/youtubei/.+log_ url reject-img +^https?:\/\/api\d?\.tiktokv\.com\/api\/ad\/ url reject-img +^https?:\/\/api\d?\.musical\.ly\/api\/ad\/ url reject-img +^https?://qos-zdn.zaloapp.com/.+trackqos url reject-img +^https?://centralized.zaloapp.com/.+tracking url reject-img +^https?://oa.zalo.me/.+campaign=zalo url reject-img diff --git a/option/hostsVN-quantumultX.conf b/option/hostsVN-quantumultX.conf index 885590157..510de9361 100644 --- a/option/hostsVN-quantumultX.conf +++ b/option/hostsVN-quantumultX.conf @@ -12,6 +12,7 @@ server=8.8.8.8 https://raw.githubusercontent.com/bigdargon/hostsVN/master/option/hostsVN-quantumult-rule.conf, tag=hostsVN, force-policy=reject, enabled=true [rewrite_remote] +https://raw.githubusercontent.com/bigdargon/hostsVN/master/option/hostsVN-quantumultX-rewrite.conf, tag=hostsVN, enabled=true [server_local] shadowsocks=127.0.0.1:80, method=none, password=password, fast-open=false, udp-relay=false, tag=localhost @@ -20,49 +21,7 @@ shadowsocks=127.0.0.1:80, method=none, password=password, fast-open=false, udp-r FINAL,DIRECT [rewrite_local] -^https?:\/\/(\w+\.)?(ads|adserver|uniad|ad-|pagead|adformat|log\w?|tj|tongji|analysis|stat|stats|statis|trace|track|tracking|click)\.\w+\.(com|cn|org|info|io|net|vn) url reject-img -^http?://ocsp.apple.com/* url reject-img -^https?://graph.facebook.com/network_ads_common/* url reject-img -^https?://graph.facebook.com/.+activities url reject-img -^https?://graph.facebook.com/.+advertiser_id=* url reject-img -^https?://www.facebook.com/adnw_logging/* url reject-img -^https?://graph.nhaccuatui.com/.+advs/* url reject-img -^https?://graph.nhaccuatui.com/.+logs/* url reject-img -^https?://graph.nhaccuatui.com/.+3g-get-info url reject-img -^https?://graph.nhaccuatui.com/.+deviceinfo url reject-img -^https?://graph.nhaccuatui.com/.+notify-firebase url reject-img -^https?://avatar-nct.nixcdn.com/.+popup url reject-img -^https?://spclient.wg.spotify.com/ad-logic/* url reject-img -^https?://spclient.wg.spotify.com/ads/* url reject-img -^https?://spclient.wg.spotify.com/.+ad_slot url reject-img -^https?://spclient.wg.spotify.com/.+banners url reject-img -^https?://spclient.wg.spotify.com/.+canvases url reject-img -^https?://spclient.wg.spotify.com/.+crashlytics url reject-img -^https?://spclient.wg.spotify.com/.+doubleclick.net url reject-img -^https?://spclient.wg.spotify.com/.+enabled-tracks url reject-img -^https?://spclient.wg.spotify.com/.+event url reject-img -^https?://spclient.wg.spotify.com/.+promoted_offer url reject-img -^https?:\/\/.+\.googlevideo\.com\/.+&oad url reject-img -^https?:\/\/.+\.googlevideo\.com\/.+&owc url reject-img -!^https?:\/\/.+\.googlevideo\.com\/.+ctier url reject-img -^https?:\/\/.+\.googlevideo\.com\/ptracking\?pltype=adhost url reject-img -^https?:\/\/.+\.googlevideo\.com\/videogoodput\? url reject-img -^https?:\/\/.+\.youtube\.com\/.+get_ads url reject-img -^https?:\/\/.+\.youtube\.com\/api\/stats\/.+adformat url reject-img -^https?:\/\/.+\.youtube\.com\/api\/stats\/ads url reject-img -^https?:\/\/.+\.youtube\.com\/error_204 url reject-img -^https?:\/\/.+\.youtube\.com\/get_midroll url reject-img -^https?:\/\/.+\.youtube\.com\/pagead\/* url reject-img -^https?:\/\/.+\.youtube\.com\/ptracking\? url reject-img -^https?:\/\/play.googleapis.com/log* url reject-img -^https?:\/\/www.googleapis.com/adsmeasurement/* url reject-img -^https?:\/\/youtubei.googleapis.com/youtubei/.+ad_ url reject-img -^https?:\/\/youtubei.googleapis.com/youtubei/.+log_ url reject-img -^https?:\/\/api\d?\.tiktokv\.com\/api\/ad\/ url reject-img -^https?:\/\/api\d?\.musical\.ly\/api\/ad\/ url reject-img -^https?://qos-zdn.zaloapp.com/.+trackqos url reject-img -^https?://centralized.zaloapp.com/.+tracking url reject-img -^https?://oa.zalo.me/.+campaign=zalo url reject-img +!_rewrite_quantumultX_ [mitm] passphrase = DD204786 diff --git a/tmp/title-config-quantumultX.txt b/tmp/title-config-quantumultX.txt index 78c408037..0c69e21c7 100644 --- a/tmp/title-config-quantumultX.txt +++ b/tmp/title-config-quantumultX.txt @@ -12,6 +12,7 @@ server=8.8.8.8 https://raw.githubusercontent.com/bigdargon/hostsVN/master/option/hostsVN-quantumult-rule.conf, tag=hostsVN, force-policy=reject, enabled=true [rewrite_remote] +https://raw.githubusercontent.com/bigdargon/hostsVN/master/option/hostsVN-quantumultX-rewrite.conf, tag=hostsVN, enabled=true [server_local] shadowsocks=127.0.0.1:80, method=none, password=password, fast-open=false, udp-relay=false, tag=localhost