Compare commits

...

8 Commits

Author SHA1 Message Date
loyalsoldier
ac4af75c51 Remove easylist from README 2020-04-07 22:09:10 +08:00
loyalsoldier
cdf564fdfa Remove easylists' Ad hosts from reject-list 2020-04-07 22:06:15 +08:00
loyalsoldier
c4dd3bd164 Update README description & V2Ray config 2020-04-07 15:15:20 +08:00
Loyalsoldier
900d0e1c06 Fix easylist regexp error 2020-04-07 14:57:17 +08:00
loyalsoldier
e5831eec05 Add EasyList & EasyListChina & EasyListPrivacy into rejectlist 2020-04-06 22:38:00 +08:00
Loyalsoldier
8352df9737 Update README.md 2020-04-02 23:35:50 +08:00
Loyalsoldier
0dbf14c984 Use IPIP.net CN IPv4 CIDR 2020-04-02 23:24:23 +08:00
Loyalsoldier
52fb8fa3e8 Use geoip project that replaced CN IPv4 CIDR 2020-04-02 23:22:17 +08:00
2 changed files with 14 additions and 9 deletions

View File

@@ -19,7 +19,7 @@ jobs:
run: |
echo "::set-env name=RELEASE_NAME::Released on $(date +%Y%m%d%H%M)"
echo "::set-env name=TAG_NAME::$(date +%Y%m%d%H%M)"
echo "::set-env name=GEOIP_REPO::github.com/v2ray/geoip"
echo "::set-env name=GEOIP_REPO::github.com/Loyalsoldier/geoip"
echo "::set-env name=GEOSITE_REPO::github.com/v2ray/domain-list-community"
echo "::set-env name=CHINA_DOMAINS_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf"
echo "::set-env name=GOOGLE_DOMAINS_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf"
@@ -53,7 +53,7 @@ jobs:
- name: Generate geoip.dat file
run: |
go get -u -v -insecure $GEOIP_REPO
geoip --country=./geoip/GeoLite2-Country-Locations-en.csv --ipv4=./geoip/GeoLite2-Country-Blocks-IPv4.csv --ipv6=./geoip/GeoLite2-Country-Blocks-IPv6.csv
geoip --country=./geoip/GeoLite2-Country-Locations-en.csv --ipv4=./geoip/GeoLite2-Country-Blocks-IPv4.csv --ipv6=./geoip/GeoLite2-Country-Blocks-IPv6.csv --cnipv4url=https://raw.githubusercontent.com/17mon/china_ip_list/master/china_ip_list.txt
mkdir -p ./publish
mv ./geoip.dat ./publish/

View File

@@ -10,13 +10,13 @@
### geoip.dat
- 通过仓库 [@v2ray/geoip](https://github.com/v2ray/geoip) 生成
- 其中 IP 地址来源于 [MaxMind GeoLite2](https://dev.maxmind.com/geoip/geoip2/geolite2/)
- 通过仓库 [@Loyalsoldier/geoip](https://github.com/Loyalsoldier/geoip) 生成
- 其中 IP 地址来源于 [MaxMind GeoLite2](https://dev.maxmind.com/geoip/geoip2/geolite2/)`CN` 类别下的 IPv4 地址来源于 [@17mon/china_ip_list](https://github.com/17mon/china_ip_list/blob/master/china_ip_list.txt)
### geosite.dat
- 通过仓库 [@v2ray/domain-list-community](https://github.com/v2ray/domain-list-community) 生成
- **加入大量中国大陆域名、Apple 域名Google 域名和部分海外 CDN 域名**
- **加入大量中国大陆域名、Apple 域名Google 域名**
- [@felixonmars/dnsmasq-china-list/accelerated-domains.china.conf](https://github.com/felixonmars/dnsmasq-china-list/blob/master/accelerated-domains.china.conf) 加入到 `geosite:cn` 类别中
- [@felixonmars/dnsmasq-china-list/apple.china.conf](https://github.com/felixonmars/dnsmasq-china-list/blob/master/apple.china.conf) 加入到 `geosite:geolocation-!cn` 类别中
- [@felixonmars/dnsmasq-china-list/google.china.conf](https://github.com/felixonmars/dnsmasq-china-list/blob/master/google.china.conf) 加入到 `geosite:geolocation-!cn` 类别中
@@ -136,12 +136,14 @@
"loglevel": "warning"
},
"dns": {
"hosts": {
"dns.google": "8.8.8.8"
},
"servers": [
{
"address": "https://1.1.1.1/dns-query",
"domains": [
"geosite:geolocation-!cn",
"geosite:speedtest"
"geosite:geolocation-!cn"
]
},
"https://1.1.1.1/dns-query",
@@ -151,6 +153,9 @@
"port": 53,
"domains": [
"geosite:cn"
],
"expectIPs": [
"geoip:cn"
]
}
]
@@ -242,8 +247,7 @@
"type": "field",
"outboundTag": "Proxy",
"domain": [
"geosite:geolocation-!cn",
"geosite:speedtest"
"geosite:geolocation-!cn"
]
},
{
@@ -295,6 +299,7 @@
- [@v2ray/geoip](https://github.com/v2ray/geoip)
- [@v2ray/domain-list-community](https://github.com/v2ray/domain-list-community)
- [@17mon/china_ip_list](https://github.com/17mon/china_ip_list/blob/master/china_ip_list.txt)
- [@felixonmars/dnsmasq-china-list](https://github.com/felixonmars/dnsmasq-china-list)
- [@gfwlist/gfwlist](https://github.com/gfwlist/gfwlist)
- [@cokebar/gfwlist2dnsmasq](https://github.com/cokebar/gfwlist2dnsmasq)