Update script

bigdargon · Nov 17, 2022 · d095ae2 · d095ae2
1 parent 266a94c
commit d095ae2
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 26 deletions.
diff --git a/filters/adservers-all.txt b/filters/adservers-all.txt
@@ -1,7 +1,7 @@
 ! Title: hostsVN
 ! Description: Filter contains all ad networks and tracking frequently accessed.
-! Last modified: 17 Nov 2022 10:58 UTC+7
-! Version: 2211171058
+! Last modified: 17 Nov 2022 11:18 UTC+7
+! Version: 2211171118
 ! Blocked: 8.809 rules
 ! Expires: 1 days (update frequency)
 ! Homepage: https://bigdargon.github.io/hostsVN/

diff --git a/filters/adservers.txt b/filters/adservers.txt
@@ -1,7 +1,7 @@
 ! Title: hostsVN
 ! Description: The filter contains ad and tracking networks in Vietnam.
-! Last modified: 17 Nov 2022 10:58 UTC+7
-! Version: 2211171058
+! Last modified: 17 Nov 2022 11:18 UTC+7
+! Version: 2211171118
 ! Blocked: 1.494 rules
 ! Expires: 1 days (update frequency)
 ! Homepage: https://bigdargon.github.io/hostsVN/

diff --git a/hosts b/hosts
@@ -1,6 +1,6 @@
 # Title: hostsVN
-# Last modified: 17 Nov 2022 10:58 UTC+7
-# Version: 2211171058
+# Last modified: 17 Nov 2022 11:18 UTC+7
+# Version: 2211171118
 # Blocked: 17.182 domains
 # Please report any ads or problems on GitHub
 # Homepage: https://bigdargon.github.io/hostsVN/

diff --git a/makefile.sh b/makefile.sh
@@ -54,7 +54,7 @@ cat source/exceptions.txt | grep -v '!' | awk '{print $1}' >> tmp/exceptions.tmp
 cat tmp/adservers.tmp | awk '{print "||"$1"^"}' >> tmp/adservers-rule.tmp
 cat tmp/adservers.tmp tmp/adservers-all.tmp tmp/adservers-extra.tmp | awk '{print "||"$1"^"}' >> tmp/adservers-all-rule.tmp
 cat tmp/exceptions.tmp | awk '{print "@@||"$1"^|"}' >> tmp/adservers-all-rule.tmp
-cat tmp/adservers.tmp tmp/adservers-all.tmp | awk '{print "*"$1" = 0.0.0.0"}' >> tmp/adservers-config.tmp
+cat tmp/adservers.tmp tmp/adservers-all.tmp | awk '{print "*"$1" = 0.0.0.0"}' >> tmp/adservers-surge.tmp
 
 echo "Creating wildcard file..."
 # create wildcard file
@@ -86,12 +86,12 @@ cat source/config-rewrite.txt | grep -v '#' | grep -v -e '^[[:space:]]*$' | awk
 echo "Creating config file..."
 # create config
 sed -e "s/_time_stamp_/$TIME_STAMP/g" tmp/title-config-quantumultX.txt > option/hostsVN-quantumultX.conf
+cat tmp/title-config-surge.tmp tmp/adservers-surge.tmp > option/hostsVN-surge.conf
 
 echo "Adding to file..."
 # add to files
 cat tmp/title-adserver.tmp tmp/adservers-rule.tmp > filters/adservers.txt
 cat tmp/title-adserver-all.tmp tmp/adservers-all-rule.tmp > filters/adservers-all.txt
-cat tmp/title-config-surge.tmp tmp/adservers-config.tmp > option/hostsVN.conf
 
 echo "Creating block OTA file..."
 cat source/OTA.txt | grep -v '!' | awk '{print "HOST-SUFFIX,"$1",REJECT"}' > option/hostsVN-quantumult-OTA.conf

diff --git a/option/hosts-VN b/option/hosts-VN
@@ -1,6 +1,6 @@
 # Title: hostsVN
-# Last modified: 17 Nov 2022 10:58 UTC+7
-# Version: 2211171058
+# Last modified: 17 Nov 2022 11:18 UTC+7
+# Version: 2211171118
 # Blocked: 1.702 domains
 # Only include advertisers in Vietnam
 # Homepage: https://bigdargon.github.io/hostsVN/

diff --git a/option/hosts-iOS b/option/hosts-iOS
@@ -1,6 +1,6 @@
 # Title: hostsVN
-# Last modified: 17 Nov 2022 10:58 UTC+7
-# Version: 2211171058
+# Last modified: 17 Nov 2022 11:18 UTC+7
+# Version: 2211171118
 # Blocked: 17.182 domains
 # Minimal version for iOS. Please report any ads or problems on GitHub
 # Homepage: https://bigdargon.github.io/hostsVN/

diff --git a/option/hostsVN-loon.conf b/option/hostsVN-loon.conf
@@ -1,7 +1,8 @@
 [General]
 skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local
 bypass-tun = 10.0.0.0/8,100.64.0.0/10,127.0.0.0/8,169.254.0.0/16,172.16.0.0/12,192.0.0.0/24,192.0.2.0/24,192.88.99.0/24,192.168.0.0/16,198.18.0.0/15,198.51.100.0/24,203.0.113.0/24,224.0.0.0/4,255.255.255.255/32
-dns-server = 8.8.8.8,1.1.1.1,45.90.28.0,45.90.30.0
+doh-server=https://dns.nextdns.io
+dns-server = 8.8.8.8,1.1.1.1,9.9.9.11
 allow-udp-proxy = false
 allow-wifi-access = false
 

diff --git a/option/hostsVN-quantumultX.conf b/option/hostsVN-quantumultX.conf
@@ -1,4 +1,4 @@
-# 17 Nov 2022 10:58
+# 17 Nov 2022 11:18
 [general]
 udp_whitelist=53, 1024-65535
 
@@ -7,8 +7,7 @@ no-system
 doh-server=https://dns.nextdns.io
 server=8.8.8.8
 server=1.1.1.1
-server=45.90.28.0
-server=45.90.30.0
+server=9.9.9.11
 
 [policy]
 

diff --git a/option/hostsVN-shadowrocket.conf b/option/hostsVN-shadowrocket.conf
@@ -1,7 +1,7 @@
 [General]
 bypass-system = true
 skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local
-dns-server = https://dns.nextdns.io,8.8.8.8,1.1.1.1,45.90.28.0,45.90.30.0
+dns-server = https://dns.nextdns.io,8.8.8.8,1.1.1.1,9.9.9.11
 update-url = https://raw.githubusercontent.com/bigdargon/hostsVN/master/option/hostsVN-shadowrocket.conf
 
 [Rule]

diff --git a/option/hostsVN-surge-pro.conf b/option/hostsVN-surge-pro.conf
@@ -3,7 +3,7 @@ loglevel = notify
 skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local
 doh-server = https://dns.nextdns.io
 doh-skip-cert-verification = true
-dns-server = 8.8.8.8, 1.1.1.1, 45.90.28.0, 45.90.30.0
+dns-server = 8.8.8.8, 1.1.1.1, 9.9.9.11
 allow-wifi-access = false
 
 [Replica]

diff --git a/option/hostsVN.conf → option/hostsVN-surge.conf b/option/hostsVN.conf → option/hostsVN-surge.conf
@@ -1,10 +1,10 @@
-#!MANAGED-CONFIG https://raw.githubusercontent.com/bigdargon/hostsVN/master/option/hostsVN.conf interval=21600 strict=true
+#!MANAGED-CONFIG https://raw.githubusercontent.com/bigdargon/hostsVN/master/option/hostsVN-surge.conf interval=21600 strict=true
 [General]
 loglevel = notify
 skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local
 doh-server = https://dns.nextdns.io
 doh-skip-cert-verification = true
-dns-server = 8.8.8.8, 1.1.1.1, 45.90.28.0, 45.90.30.0
+dns-server = 8.8.8.8, 1.1.1.1, 9.9.9.11
 allow-wifi-access = false
 
 [Replica]

diff --git a/tmp/title-config-loon.txt b/tmp/title-config-loon.txt
@@ -1,7 +1,8 @@
 [General]
 skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local
 bypass-tun = 10.0.0.0/8,100.64.0.0/10,127.0.0.0/8,169.254.0.0/16,172.16.0.0/12,192.0.0.0/24,192.0.2.0/24,192.88.99.0/24,192.168.0.0/16,198.18.0.0/15,198.51.100.0/24,203.0.113.0/24,224.0.0.0/4,255.255.255.255/32
-dns-server = 8.8.8.8,1.1.1.1,45.90.28.0,45.90.30.0
+doh-server=https://dns.nextdns.io
+dns-server = 8.8.8.8,1.1.1.1,9.9.9.11
 allow-udp-proxy = false
 allow-wifi-access = false
 

diff --git a/tmp/title-config-quantumultX.txt b/tmp/title-config-quantumultX.txt
@@ -7,8 +7,7 @@ no-system
 doh-server=https://dns.nextdns.io
 server=8.8.8.8
 server=1.1.1.1
-server=45.90.28.0
-server=45.90.30.0
+server=9.9.9.11
 
 [policy]
 

diff --git a/tmp/title-config-shadowrocket.txt b/tmp/title-config-shadowrocket.txt
@@ -1,7 +1,7 @@
 [General]
 bypass-system = true
 skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local
-dns-server = https://dns.nextdns.io,8.8.8.8,1.1.1.1,45.90.28.0,45.90.30.0
+dns-server = https://dns.nextdns.io,8.8.8.8,1.1.1.1,9.9.9.11
 update-url = https://raw.githubusercontent.com/bigdargon/hostsVN/master/option/hostsVN-shadowrocket.conf
 
 [Rule]

diff --git a/tmp/title-config-surge.txt b/tmp/title-config-surge.txt
@@ -1,10 +1,10 @@
-#!MANAGED-CONFIG https://raw.githubusercontent.com/bigdargon/hostsVN/master/option/hostsVN.conf interval=21600 strict=true
+#!MANAGED-CONFIG https://raw.githubusercontent.com/bigdargon/hostsVN/master/option/hostsVN-surge.conf interval=21600 strict=true
 [General]
 loglevel = notify
 skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local
 doh-server = https://dns.nextdns.io
 doh-skip-cert-verification = true
-dns-server = 8.8.8.8, 1.1.1.1, 45.90.28.0, 45.90.30.0
+dns-server = 8.8.8.8, 1.1.1.1, 9.9.9.11
 allow-wifi-access = false
 
 [Replica]