From 00ae59560a28d45ea92f2782e994f9bd80c26ed2 Mon Sep 17 00:00:00 2001 From: lhie1 Date: Thu, 7 Mar 2019 01:33:10 +0800 Subject: [PATCH] SMTP --- Clash/Rule.yml | 2 ++ DlerCloud/MediaRule.conf | 53 ++++++++++++++++++++-------------------- DlerCloud/OldRule.conf | 12 +++++---- DlerCloud/Rule.conf | 36 ++++++++++++++------------- Surfboard/Surfboard.conf | 1 + 5 files changed, 56 insertions(+), 48 deletions(-) diff --git a/Clash/Rule.yml b/Clash/Rule.yml index 4d2498e..446ad06 100644 --- a/Clash/Rule.yml +++ b/Clash/Rule.yml @@ -1,4 +1,6 @@ Rule: +- DOMAIN-KEYWORD,smtp,DIRECT + - DOMAIN-SUFFIX,digicert.com,DIRECT - DOMAIN-SUFFIX,mzstatic.com,Domestic - DOMAIN-SUFFIX,akadns.net,Domestic diff --git a/DlerCloud/MediaRule.conf b/DlerCloud/MediaRule.conf index 4fa7bd2..5457da4 100644 --- a/DlerCloud/MediaRule.conf +++ b/DlerCloud/MediaRule.conf @@ -1,31 +1,32 @@ [Rule] +DOMAIN-KEYWORD,smtp,DIRECT -USER-AGENT, AppStore*, Apple -USER-AGENT, com.apple.appstored*, Apple -USER-AGENT, TestFlight*, Apple -DOMAIN-SUFFIX, apple.com, Apple -DOMAIN-SUFFIX, icloud.com, Apple -DOMAIN-SUFFIX, itunes.com, Apple -DOMAIN-SUFFIX, me.com, Apple -DOMAIN-SUFFIX, mzstatic.com, Apple +USER-AGENT,AppStore*,Apple +USER-AGENT,com.apple.appstored*,Apple +USER-AGENT,TestFlight*,Apple +DOMAIN-SUFFIX,apple.com,Apple +DOMAIN-SUFFIX,icloud.com,Apple +DOMAIN-SUFFIX,itunes.com,Apple +DOMAIN-SUFFIX,me.com,Apple +DOMAIN-SUFFIX,mzstatic.com,Apple # Rulesets -RULE-SET, SYSTEM, Apple -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/reject.list, AdBlock -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/abematv.list, AbemaTV -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/bahamut.list, Bahamut -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/bbc.list, BBC -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/bilibili&iqiyi.list, Bilibili & Iqiyi -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/hbo&hbogo.list, Hbo -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/hulu.list, Hulu -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/mytvsuper&joox.list, MytvSUPER & JOOX -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/netflix.list, Netflix -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/youtube.list, Youtube -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/proxy.list, Proxy -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/domestic.list, Domestic -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/domestic_media.list, Domestic_media -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/foreign_media.list, Foreign_media -RULE-SET, LAN, DIRECT +RULE-SET,SYSTEM,Apple +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/reject.list,AdBlock +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/abematv.list,AbemaTV +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/bahamut.list,Bahamut +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/bbc.list,BBC +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/bilibili&iqiyi.list,Bilibili & Iqiyi +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/hbo&hbogo.list,Hbo +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/hulu.list,Hulu +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/mytvsuper&joox.list,MytvSUPER & JOOX +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/netflix.list,Netflix +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/Media/youtube.list,Youtube +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/proxy.list,Proxy +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/domestic.list,Domestic +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/domestic_media.list,Domestic_media +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/foreign_media.list,Foreign_media +RULE-SET,LAN,DIRECT -GEOIP, CN, Domestic -FINAL, Others, dns-failed \ No newline at end of file +GEOIP,CN,Domestic +FINAL,Others,dns-failed \ No newline at end of file diff --git a/DlerCloud/OldRule.conf b/DlerCloud/OldRule.conf index ea086e2..437167e 100644 --- a/DlerCloud/OldRule.conf +++ b/DlerCloud/OldRule.conf @@ -1,4 +1,6 @@ [Rule] +DOMAIN-KEYWORD,smtp,DIRECT + USER-AGENT,AppStore*,Apple USER-AGENT,com.apple.appstored*,Apple USER-AGENT,TestFlight*,Apple @@ -9678,11 +9680,11 @@ IP-CIDR,1.255.62.0/24,Domestic,no-resolve -DOMAIN-SUFFIX,local,DIRECT -IP-CIDR,10.0.0.0/8,DIRECT -IP-CIDR,100.64.0.0/10,DIRECT -IP-CIDR,127.0.0.0/8,DIRECT -IP-CIDR,172.16.0.0/12,DIRECT +DOMAIN-SUFFIX,local,DIRECT +IP-CIDR,10.0.0.0/8,DIRECT +IP-CIDR,100.64.0.0/10,DIRECT +IP-CIDR,127.0.0.0/8,DIRECT +IP-CIDR,172.16.0.0/12,DIRECT IP-CIDR,192.168.0.0/16,DIRECT GEOIP,CN,Domestic diff --git a/DlerCloud/Rule.conf b/DlerCloud/Rule.conf index 6e18d5b..62a0cb8 100644 --- a/DlerCloud/Rule.conf +++ b/DlerCloud/Rule.conf @@ -1,21 +1,23 @@ [Rule] -USER-AGENT, AppStore*,Apple -USER-AGENT, com.apple.appstored*,Apple -USER-AGENT, TestFlight*,Apple -DOMAIN-SUFFIX, apple.com,Apple -DOMAIN-SUFFIX, icloud.com,Apple -DOMAIN-SUFFIX, itunes.com,Apple -DOMAIN-SUFFIX, me.com,Apple -DOMAIN-SUFFIX, mzstatic.com,Apple +DOMAIN-KEYWORD,smtp,DIRECT + +USER-AGENT,AppStore*,Apple +USER-AGENT,com.apple.appstored*,Apple +USER-AGENT,TestFlight*,Apple +DOMAIN-SUFFIX,apple.com,Apple +DOMAIN-SUFFIX,icloud.com,Apple +DOMAIN-SUFFIX,itunes.com,Apple +DOMAIN-SUFFIX,me.com,Apple +DOMAIN-SUFFIX,mzstatic.com,Apple # Rulesets -RULE-SET, SYSTEM,Apple -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/reject.list, AdBlock -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/domestic_media.list, Domestic_media -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/foreign_media.list, Foreign_media -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/proxy.list, Proxy -RULE-SET, https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/domestic.list, Domestic -RULE-SET, LAN,DIRECT +RULE-SET,SYSTEM,Apple +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/reject.list,AdBlock +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/domestic_media.list,Domestic_media +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/foreign_media.list,Foreign_media +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/proxy.list,Proxy +RULE-SET,https://raw.githubusercontent.com/lhie1/Rules/master/Surge3/domestic.list,Domestic +RULE-SET,LAN,DIRECT -GEOIP, CN, Domestic -FINAL, Others, dns-failed \ No newline at end of file +GEOIP,CN,Domestic +FINAL,Others,dns-failed \ No newline at end of file diff --git a/Surfboard/Surfboard.conf b/Surfboard/Surfboard.conf index 3e60e56..896979f 100644 --- a/Surfboard/Surfboard.conf +++ b/Surfboard/Surfboard.conf @@ -1,4 +1,5 @@ [Rule] +DOMAIN-KEYWORD,smtp,DIRECT # Advertising Block 去广告以及隐私追踪保护 # > General