Merge branch 'bootmortis:main' into main

MasterKia · May 27, 2024 · 1ff2f8a · 1ff2f8a
2 parents e9e2af5 + a42f03f
commit 1ff2f8a
Show file tree

Hide file tree

Showing 6 changed files with 286 additions and 129 deletions.
diff --git a/.github/ISSUE_TEMPLATE/add-or-remove-domain.yml b/.github/ISSUE_TEMPLATE/add-or-remove-domain.yml
@@ -0,0 +1,47 @@
+name: Add or Remove Domain
+description: Use this form to request a domain to be added or removed from the list.
+title: "[Add/Remove]: `example.com`"
+labels: [domain]
+body:
+  - type: input
+    id: domain
+    attributes:
+      label: Domain Address
+      placeholder: example.com
+      description: Please provide the domain name you would like to add or remove.
+    validations:
+      required: true
+  - type: dropdown
+    id: add-or-remove
+    attributes:
+      label: Add or Remove
+      description: Specify whether you want this domain to be added or removed.
+      multiple: false
+      options:
+        - Added ✅
+        - Removed ❌
+    validations:
+      required: true
+  - type: textarea
+    id: reason
+    attributes:
+      label: Reason
+      placeholder: This domain is used in... Therefore, I request it to be added/removed from the list...
+      description: Please explain why you want to add or remove this domain from the list.
+    validations:
+      required: true
+  - type: textarea
+    id: evidence
+    attributes:
+      label: Supporting Evidence
+      description: If available, please provide any relevant supporting evidence for your request (e.g., screenshots).
+    validations:
+      required: false
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Verify Existing Domains
+      description: Please review the current [bypass list](https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/domains.txt) to ensure this domain is not already listed.
+      options:
+        - label: "I have checked the list and confirmed the domain is not included"
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/request-for-domain-addition-removal.md b/.github/ISSUE_TEMPLATE/request-for-domain-addition-removal.md
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
           cache: false
 
       - name: Env

diff --git a/README.fa.md b/README.fa.md
@@ -349,6 +349,49 @@ https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/switc
 
 ### [Sing-Box](https://github.com/SagerNet/sing-box)
 
+#### فرمت `geosite.srs`
+
+فایل کانفیگ sing-box را باز کنید و بخش Route را در این [فرمت](https://sing-box.sagernet.org/configuration/rule-set/) ویرایش کنید:
+```json
+{
+  "route": {
+    "rule_set": [
+      {
+        "tag": "iran-geosite-ads",
+        "type": "remote",
+        "format": "binary",
+        "update_interval": "7d",
+        "url": "https://github.com/bootmortis/sing-geosite/releases/latest/download/geosite-ads.srs"
+      },
+      {
+        "tag": "iran-geosite-all",
+        "type": "remote",
+        "format": "binary",
+        "update_interval": "7d",
+        "url": "https://github.com/bootmortis/sing-geosite/releases/latest/download/geosite-all.srs"
+      }
+    ],
+    "rules": [
+      {
+        "rule_set": [
+          "iran-geosite-ads"
+        ],
+        "outbound": "block"
+      },
+      {
+        "rule_set": [
+          "iran-geosite-all"
+        ],
+        "outbound": "direct"
+      }
+    ]
+  }
+}
+```
+#### فرمت `geosite.db`
+
+⚠️نکته: این فرمت قدیمی شده و ممکن است در نسخه های آینده پشتیبانی نشود، برای مهاجرت به نسخه‌ی جدید [اینجا](https://sing-box.sagernet.org/migration/#migrate-geosite-to-rule-sets) و برای اطلاعات بیشتر [اینجا](https://github.com/bootmortis/iran-hosted-domains/issues/180)  را ببینید.
+
 1. فایل `iran-geosite.db` را از [اینجا][link-release] دانلود کرده و در پوشه sing-box قرار دهید.
 2. فایل کانفیگ sing-box را باز کنید و بخش Route را در این [فرمت](https://sing-box.sagernet.org/configuration/route/geosite/) ویرایش کنید:
 
@@ -572,6 +615,7 @@ go run ./ --outputdir=../
 - فایل **domains.txt**: تمام وب سایت های میزبانی شده در ایران را شامل می شود.
 - فایل‌های **hysteria_client.acl** و **hysteria_server.acl**: بخش [Hysteria](#hysteria) را ببینید.
 - فایل **iran-geosite.db**: برای هسته sing-box بخش [Sing-Box](#sing-box) را ببینید.
+- فایل‌های **geosite-*.srs**: برای sing-box ورژن 1.8 به بعد، این فایل‌ها را می‌توانید از [این صفحه](https://github.com/bootmortis/sing-geosite/releases/latest) دریافت کنید.
 - فایل **iran.dat**: تمام وب سایت های میزبانی شده در ایران، تبلیغات و دامنه های مرتبط با پروکسی برای v2ray/xray را شامل می شود، برای اطلاعات بیشتر [دسته بندی های کامل](#دسته-بندی-کامل) را ببینید.
 - فایل **qv2ray_schema.json**: سناریوی json قابل وارد کردن که می تواند در [Qv2ray](#qv2ray) استفاده شود.
 - فایل **shadowrocket.conf:** فایل conf قابل وارد کردن که می تواند در [Shadowrocket](#shadowrocket) استفاده شود.

diff --git a/README.md b/README.md
@@ -333,6 +333,49 @@ https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/switc
 
 ### [Sing-Box](https://github.com/SagerNet/sing-box)
 
+#### `geosite.srs` formatting:
+
+Open the sing-box config file and edit the Route section in this [format](https://sing-box.sagernet.org/configuration/rule-set/):
+```json
+{
+  "route": {
+    "rule_set": [
+      {
+        "tag": "iran-geosite-ads",
+        "type": "remote",
+        "format": "binary",
+        "update_interval": "7d",
+        "url": "https://github.com/bootmortis/sing-geosite/releases/latest/download/geosite-ads.srs"
+      },
+      {
+        "tag": "iran-geosite-all",
+        "type": "remote",
+        "format": "binary",
+        "update_interval": "7d",
+        "url": "https://github.com/bootmortis/sing-geosite/releases/latest/download/geosite-all.srs"
+      }
+    ],
+    "rules": [
+      {
+        "rule_set": [
+          "iran-geosite-ads"
+        ],
+        "outbound": "block"
+      },
+      {
+        "rule_set": [
+          "iran-geosite-all"
+        ],
+        "outbound": "direct"
+      }
+    ]
+  }
+}
+```
+
+#### `geosite.db` formatting:
+
+⚠️ Important: Geosite is deprecated and may be removed in the future, check [Migration](https://sing-box.sagernet.org/migration/#migrate-geosite-to-rule-sets) or [here](https://github.com/bootmortis/iran-hosted-domains/issues/180).
 1. Download `iran-geosite.db` file from [here][link-release] and place it in the sing-box working directory.
 2. Open the sing-box config file and edit the Route section in this [format](https://sing-box.sagernet.org/configuration/route/geosite/)
 
@@ -360,7 +403,6 @@ https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/switc
   }
 }
 ```
-
 3. For more information about the sing-box config template [see here](https://sing-box.sagernet.org/configuration/).
 
 ### [Hysteria](https://github.com/apernet/hysteria)
@@ -539,6 +581,7 @@ Also, for each file there is a `.sha256` file that contains sha256 hash of that
 - **domains.txt**: Contains all websites hosted in Iran.
 - **hysteria_client.acl** and **hysteria_server.acl**: see [Hysteria](#hysteria) section.
 - **iran-geosite.db**: for sing-box core see [Sing-Box](#sing-box) section.
+- **geosite-*.srs** files: for sing-box v1.8 and later, these files are available [here](https://github.com/bootmortis/sing-geosite/releases/latest).
 - **iran.dat**: Contains all websites hosted in Iran, ADs and proxy related domains for v2ray/xray, see [Full Categories](#full-categories) for more info.
 - **qv2ray_schema.json**: Importable json schema that can be used in [Qv2ray](#qv2ray).
 - **shadowrocket.conf:** Importable conf file that can be used in [Shadowrocket](#shadowrocket).