diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a86cfa819d..7eb93decf6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,6 +58,8 @@ jobs: rm -f geoip.dat geosite.dat iran.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat + wget -O geoip_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat + wget -O geosite_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat wget https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat mv xray xray-linux-${{ matrix.platform }} cd ../.. diff --git a/DockerInit.sh b/DockerInit.sh index 1c236ee5b9..3cc31a3d19 100755 --- a/DockerInit.sh +++ b/DockerInit.sh @@ -23,6 +23,8 @@ unzip "Xray-linux-${ARCH}.zip" rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat iran.dat mv xray "xray-linux-${FNAME}" -wget "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat" -wget "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat" +wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat +wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat +wget -O geoip_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat +wget -O geosite_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat wget "https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat" diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html index 39a24c109f..47e3405d88 100644 --- a/web/html/xui/settings.html +++ b/web/html/xui/settings.html @@ -472,13 +472,14 @@

ips: { local: ["geoip:private"], cn: ["geoip:cn"], - ir: ["geoip:ir"], + ir: ["geoip:ir","ext:geoip_ch.dat:arvancloud","ext:geoip_ch.dat:derakcloud","ext:geoip_ch.dat:iranserver"], ru: ["geoip:ru"], }, domains: { ads: [ "geosite:category-ads-all", - "ext:iran.dat:ads" + "ext:iran.dat:ads", + "ext:geosite_ch.dat:ads" ], speedtest: ["geosite:speedtest"], openai: ["geosite:openai"], diff --git a/x-ui.sh b/x-ui.sh index d193c64232..58351c78eb 100644 --- a/x-ui.sh +++ b/x-ui.sh @@ -522,6 +522,8 @@ update_geo() { rm -f geoip.dat geosite.dat iran.dat wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat + wget -O geoip_ch.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat + wget -O geosite_ch.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat wget -N https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat systemctl start x-ui echo -e "${green}Geosite.dat + Geoip.dat + Iran.dat have been updated successfully in bin folder '${binfolder}'!${plain}"