Skip to content

Commit 876165f

Browse files
chore(docs): update notes section content in GeoIP2-CN documentation
1 parent 4551075 commit 876165f

File tree

3 files changed

+61
-69
lines changed

3 files changed

+61
-69
lines changed

Docs/en-US/README.md

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This project provides scripts and configurations to automatically download and b
1616

1717
## **Project Background**
1818

19-
GeoIP databases are widely used in network security and traffic routing to determine IP location and assist with smart routing or access control. Many current projects rely on third-party distribution sources, which introduce potential risks:
19+
GeoIP databases are widely used in network security and traffic policy routing to determine IP geolocation and assist with smart routing or access control. Many current projects rely on third-party distribution sources, which introduce potential risks:
2020

2121
- **Lack of trust chain**: Non-official sources cannot be audited and may be tampered with;
2222
- **Poor maintainability**: Sources may become unavailable without notice;
@@ -28,7 +28,7 @@ To address these issues, this project implements a fully self-controlled update
2828

2929
- **Official Data Source:** All data is directly fetched from MaxMind, ensuring trust and security;
3030
- **Automated Updates:** GitHub Actions pulls the latest data every 3 days to maintain synchronization;
31-
- **License Compliance:** The project uses GitHub Actions to fetch MaxMind data in accordance with the [GeoLite2 EULA](https://www.maxmind.com/en/geolite2/eula). Users are advised to apply for their own License Key to ensure legal, secure, and traceable data usage.
31+
- **License Compliance:** The project uses GitHub Actions to fetch MaxMind data in accordance with the [GeoLite2 EULA](https://www.maxmind.com/en/geolite2/eula). Users are strongly encouraged to apply for their own License Key to ensure legal, secure, and traceable data usage.
3232
- **Customizable & Controllable:** Users can configure output paths, update frequency, target branches, and other parameters to suit their specific deployment needs.
3333

3434
### **Automated Updates**
@@ -51,33 +51,28 @@ Copy the file URL → Open Surge → Go to General → GeoIP Database → Remove
5151

5252
## **⚠️ Important Notes**
5353

54-
1. **Disable or remove any rules related to CN IP ranges:**
54+
1. **In this project, only manual commits (made by real developers) are signed with a GPG key.**
5555

56-
```
57-
RULE-SET,https://raw.githubusercontent.com/Thoseyearsbrian/Aegis/main/SurgeAegis/rules/China.list,DIRECT # Remove this
58-
GEOIP,CN,DIRECT # Also avoid using this with the above line
59-
```
56+
Automated updates (such as GeoLite2 database updates) are executed via GitHub Actions and **do not use GPG signatures**. Please verify the committer as [`github-actions[bot]`](https://github.com/apps/github-actions) to consider the commit valid and trustworthy.
6057

61-
2.The GEOIP,CN,DIRECT rule should be placed **just above the final rule** to ensure correct evaluation order:
58+
- Manual commits are still GPG-signed to identify the authentic developer
59+
- We do **not recommend** storing any GPG private keys on GitHub to prevent key leakage and signature abuse
6260

63-
```
64-
# ... other rules ...
65-
GEOIP,CN,DIRECT # Place here
66-
FINAL,REJECT
67-
```
61+
2. **It is recommended to combine `China.list` (for domains) with `GEOIP,CN` (for IP ranges) to improve accuracy when matching China-related traffic:**
6862

69-
3.Do **not use GEOIP rules for countries other than China, as this database only contains **China mainland IP segments**:
63+
RULE-SET,https://raw.githubusercontent.com/Thoseyearsbrian/Aegis/main/rules/China.list, DIRECT # Accurately match domains related to China
64+
GEOIP,CN,DIRECT # Match mainland China IPs not covered by domain rules
65+
FINAL,REJECT # Final default reject rule (do not place GEOIP below this)
7066

71-
```
72-
GEOIP,US,PROXY # Incorrect – will not match
73-
GEOIP,AU,PROXY # Incorrect – will not match
74-
GEOIP,HK,PROXY # Incorrect – will not match
75-
GEOIP,CN,DIRECT # Correct
76-
```
67+
3. **Do not use GEOIP rules for countries other than mainland China, as the current database only contains CN IP ranges:**
68+
69+
GEOIP, US, PROXY # Invalid – No matching records found
70+
GEOIP, AU, PROXY # Invalid – No matching records found
71+
GEOIP, CN, DIRECT # Valid
7772

7873
## **🔐 Disclaimer**
7974

80-
The .mmdb file generated by this project is intended **for testing and educational purposes only**. It must **not be used for any form of commercial use**.
75+
The .mmdb file generated by this project is intended **for testing and educational purposes only**. It must **not be used in any form of commercial activity**.
8176

8277
Users are solely responsible for ensuring compliance with the [MaxMind GeoLite2 EULA](https://www.maxmind.com/en/geolite2/eula) and applicable laws and regulations. **This project accepts no legal liability for any use of the data.**
8378

@@ -91,4 +86,4 @@ This project is **intended for developers with a technical background and awaren
9186

9287
- This project uses GitHub Actions to automatically pull data from MaxMind. **You must register on MaxMind and obtain your own License Key** to run the build script or automation legally.
9388
- GeoLite2 data is copyrighted by [MaxMind, Inc.](https://www.maxmind.com/) and is licensed under the [GeoLite2 EULA](https://www.maxmind.com/en/geolite2/eula).
94-
- All scripts and configurations in this project are released under the [MIT License](https://raw.githubusercontent.com/Thoseyearsbrian/GeoIP2-CN/main/LICENSE).
89+
- All scripts and configuration files in this project are licensed under the [Apache License 2.0](https://raw.githubusercontent.com/Thoseyearsbrian/GeoIP2-CN/main/LICENSE).

Docs/zh-CN/README.md

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -49,30 +49,32 @@
4949
<img src="https://raw.githubusercontent.com/Thoseyearsbrian/GeoIP2-CN/main/Icons/Groups/surge-geoip-config-guide-step-by-step.png" width="600">
5050
</p>
5151

52-
## ⚠️ 注意事项
53-
1. **禁用或删除****中国大陆 IP 地址段** 相关的规则或规则集
54-
55-
``` bash
56-
RULE-SET,https://raw.githubusercontent.com/Thoseyearsbrian/Aegis/main/SurgeAegis/rules/China.list, DIRECT # 禁用或删除类似规则
57-
GEOIP,CN,DIRECT # 与上一条类似的规则与本条规则不可共存
58-
```
52+
## ⚠️ 注意事项
53+
54+
1. **本项目中,仅人工提交(由真实开发者进行)使用 GPG 密钥进行签名验证。**
55+
56+
自动化更新(如 GeoLite2 数据更新)由 GitHub Actions 执行,不会使用 GPG 签名。请认准提交者为 [`github-actions[bot]`](https://github.com/apps/github-actions) 即可视为有效与可信。
57+
58+
- 人工提交仍启用 GPG 签名验证,用于标识真实开发者身份
59+
- 我们不建议将任何 GPG 私钥托管于 GitHub,以避免密钥泄露和签名滥用
5960

60-
2. GEOIP-CN 查询规则建议**紧随最终规则之上**,以避免域名规则被忽略导致判断错误。
61-
``` bash
62-
# ... 省略其他规则 ...
63-
GEOIP,CN,DIRECT # 建议在这里使用规则
64-
FINAL,REJECT # 最终规则
65-
```
66-
67-
3. 规则中**不可以**存在其他国家或地区的 `GEOIP` 查询规则,因为项目提供的数据库中**仅包含中国大陆地区的 IP 地址段记录**
68-
``` bash
69-
GEOIP, US, PROXY # 错误,无法查询到相关记录
70-
GEOIP, AU, PROXY # 错误,无法查询到相关记录
71-
GEOIP, HK, PROXY # 错误,无法查询到相关记录
72-
GEOIP, CN, DIRECT # 正确
73-
```
74-
75-
🔐 免责声明
61+
2. **推荐将`China.list`(域名)与 `GEOIP,CN`(IP段)规则组合使用,以提高对中国流量的匹配准确性:**
62+
63+
```bash
64+
RULE-SET,https://raw.githubusercontent.com/Thoseyearsbrian/Aegis/main/rules/China.list, DIRECT # 精确匹配中国域名
65+
GEOIP,CN,DIRECT # 匹配未在域名规则中出现的中国大陆 IP
66+
FINAL,REJECT # 最终默认拒绝规则(请勿将 GEOIP 放于其后)
67+
```
68+
69+
3. **严禁使用非中国大陆国家的 GEOIP 查询规则,因为目前使用的数据库中仅支持 CN 段落**
70+
71+
```bash
72+
GEOIP, US, PROXY # 错误,无法查询到相关记录
73+
GEOIP, AU, PROXY # 错误,无法查询到相关记录
74+
GEOIP, CN, DIRECT # 正确
75+
```
76+
77+
## 🔐 免责声明
7678

7779
本项目构建所得 `.mmdb` 文件仅用于测试与学习研究用途,**不得用于任何形式的商业用途**
7880

@@ -84,10 +86,10 @@
8486

8587
**本项目仅面向具备基础技术背景与合规意识的开发者群体使用。**
8688

87-
## 🏅 版权声明
89+
## 🏅 版权声明
8890

8991
- 本项目通过自动构建流程生成 `.mmdb` 文件供测试与研究用途,访问者请确保已阅读并接受 [MaxMind EULA](https://www.maxmind.com/en/geolite2/eula)**本项目不对用户的任何用途或行为承担法律责任,使用者需自行确保合规;**
9092
- 本项目使用 GitHub Actions 自动拉取 MaxMind 官方数据。**使用本项目前,用户需前往 MaxMind 官网注册并获取属于自己的 License Key**,以便合规运行脚本或自动更新流程;
9193
- GeoLite2 数据版权归 [MaxMind, Inc.](https://www.maxmind.com/) 所有,遵循其 [GeoLite2 数据库许可协议](https://www.maxmind.com/en/geolite2/eula)
92-
- 本项目中所含脚本和配置文件遵循 [MIT License](https://raw.githubusercontent.com/Thoseyearsbrian/GeoIP2-CN/main/LICENSE)。
94+
- 本项目中所含脚本和配置文件遵循 [Apache License 2.0](https://raw.githubusercontent.com/Thoseyearsbrian/GeoIP2-CN/main/LICENSE)
9395
- 此外,Aegis 项目已启用 GPG 签名(Git Commit Signing)机制,以确保项目代码来源真实可信、未被篡改。你可通过 GPG 签名验证每一次提交操作的完整性,从而获得更高的安全保障。

README.md

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This project provides scripts and configurations to automatically download and b
1616

1717
## **Project Background**
1818

19-
GeoIP databases are widely used in network security and traffic routing to determine IP location and assist with smart routing or access control. Many current projects rely on third-party distribution sources, which introduce potential risks:
19+
GeoIP databases are widely used in network security and traffic policy routing to determine IP geolocation and assist with smart routing or access control. Many current projects rely on third-party distribution sources, which introduce potential risks:
2020

2121
- **Lack of trust chain**: Non-official sources cannot be audited and may be tampered with;
2222
- **Poor maintainability**: Sources may become unavailable without notice;
@@ -28,7 +28,7 @@ To address these issues, this project implements a fully self-controlled update
2828

2929
- **Official Data Source:** All data is directly fetched from MaxMind, ensuring trust and security;
3030
- **Automated Updates:** GitHub Actions pulls the latest data every 3 days to maintain synchronization;
31-
- **License Compliance:** The project uses GitHub Actions to fetch MaxMind data in accordance with the [GeoLite2 EULA](https://www.maxmind.com/en/geolite2/eula). Users are advised to apply for their own License Key to ensure legal, secure, and traceable data usage.
31+
- **License Compliance:** The project uses GitHub Actions to fetch MaxMind data in accordance with the [GeoLite2 EULA](https://www.maxmind.com/en/geolite2/eula). Users are strongly encouraged to apply for their own License Key to ensure legal, secure, and traceable data usage.
3232
- **Customizable & Controllable:** Users can configure output paths, update frequency, target branches, and other parameters to suit their specific deployment needs.
3333

3434
### **Automated Updates**
@@ -51,33 +51,28 @@ Copy the file URL → Open Surge → Go to General → GeoIP Database → Remove
5151

5252
## **⚠️ Important Notes**
5353

54-
1. **Disable or remove any rules related to CN IP ranges:**
54+
1. **In this project, only manual commits (made by real developers) are signed with a GPG key.**
5555

56-
```
57-
RULE-SET,https://raw.githubusercontent.com/Thoseyearsbrian/Aegis/main/SurgeAegis/rules/China.list,DIRECT # Remove this
58-
GEOIP,CN,DIRECT # Also avoid using this with the above line
59-
```
56+
Automated updates (such as GeoLite2 database updates) are executed via GitHub Actions and **do not use GPG signatures**. Please verify the committer as [`github-actions[bot]`](https://github.com/apps/github-actions) to consider the commit valid and trustworthy.
6057

61-
2.The GEOIP,CN,DIRECT rule should be placed **just above the final rule** to ensure correct evaluation order:
58+
- Manual commits are still GPG-signed to identify the authentic developer
59+
- We do **not recommend** storing any GPG private keys on GitHub to prevent key leakage and signature abuse
6260

63-
```
64-
# ... other rules ...
65-
GEOIP,CN,DIRECT # Place here
66-
FINAL,REJECT
67-
```
61+
2. **It is recommended to combine `China.list` (for domains) with `GEOIP,CN` (for IP ranges) to improve accuracy when matching China-related traffic:**
6862

69-
3.Do **not use GEOIP rules for countries other than China, as this database only contains **China mainland IP segments**:
63+
RULE-SET,https://raw.githubusercontent.com/Thoseyearsbrian/Aegis/main/rules/China.list, DIRECT # Accurately match domains related to China
64+
GEOIP,CN,DIRECT # Match mainland China IPs not covered by domain rules
65+
FINAL,REJECT # Final default reject rule (do not place GEOIP below this)
7066

71-
```
72-
GEOIP,US,PROXY # Incorrect – will not match
73-
GEOIP,AU,PROXY # Incorrect – will not match
74-
GEOIP,HK,PROXY # Incorrect – will not match
75-
GEOIP,CN,DIRECT # Correct
76-
```
67+
3. **Do not use GEOIP rules for countries other than mainland China, as the current database only contains CN IP ranges:**
68+
69+
GEOIP, US, PROXY # Invalid – No matching records found
70+
GEOIP, AU, PROXY # Invalid – No matching records found
71+
GEOIP, CN, DIRECT # Valid
7772

7873
## **🔐 Disclaimer**
7974

80-
The .mmdb file generated by this project is intended **for testing and educational purposes only**. It must **not be used for any form of commercial use**.
75+
The .mmdb file generated by this project is intended **for testing and educational purposes only**. It must **not be used in any form of commercial activity**.
8176

8277
Users are solely responsible for ensuring compliance with the [MaxMind GeoLite2 EULA](https://www.maxmind.com/en/geolite2/eula) and applicable laws and regulations. **This project accepts no legal liability for any use of the data.**
8378

@@ -91,4 +86,4 @@ This project is **intended for developers with a technical background and awaren
9186

9287
- This project uses GitHub Actions to automatically pull data from MaxMind. **You must register on MaxMind and obtain your own License Key** to run the build script or automation legally.
9388
- GeoLite2 data is copyrighted by [MaxMind, Inc.](https://www.maxmind.com/) and is licensed under the [GeoLite2 EULA](https://www.maxmind.com/en/geolite2/eula).
94-
- All scripts and configurations in this project are released under the [MIT License](https://raw.githubusercontent.com/Thoseyearsbrian/GeoIP2-CN/main/LICENSE).
89+
- All scripts and configuration files in this project are licensed under the [Apache License 2.0](https://raw.githubusercontent.com/Thoseyearsbrian/GeoIP2-CN/main/LICENSE).

0 commit comments

Comments
 (0)