From f85f6ba80d976ff1d31f5284e245bc66b9bd28d9 Mon Sep 17 00:00:00 2001 From: mzz <2017@duck.com> Date: Sat, 1 Jul 2023 12:05:03 +0800 Subject: [PATCH] chore(geodata): change back to v2fly geodata (#168) --- .github/workflows/build.yml | 4 ++-- .github/workflows/prerelease.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- Dockerfile | 4 ++-- docs/dns.md | 2 +- docs/getting-started/build-by-yourself.md | 6 +++--- docs/getting-started/run-as-daemon.md | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ff063ddf..9bf7503af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -122,8 +122,8 @@ jobs: make cp ./install/dae.service ./build/ cp ./example.dae ./build/ - curl -L -o ./build/geoip.dat https://github.com/v2ray/geoip/releases/latest/download/geoip.dat - curl -L -o ./build/geosite.dat https://github.com/v2ray/domain-list-community/releases/latest/download/dlc.dat + curl -L -o ./build/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat + curl -L -o ./build/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat - name: Smoking test if: matrix.goarch == 'amd64' && matrix.goamd64 == 'v1' diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 3a56f5215..9de74317f 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -110,8 +110,8 @@ jobs: make cp ./install/dae.service ./build/ cp ./example.dae ./build/ - curl -L -o ./build/geoip.dat https://github.com/v2ray/geoip/releases/latest/download/geoip.dat - curl -L -o ./build/geosite.dat https://github.com/v2ray/domain-list-community/releases/latest/download/dlc.dat + curl -L -o ./build/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat + curl -L -o ./build/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat - name: Smoking test if: matrix.goarch == 'amd64' && matrix.goamd64 == 'v1' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0cc3b3422..c4178ef2d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -110,8 +110,8 @@ jobs: make cp ./install/dae.service ./build/ cp ./example.dae ./build/ - curl -L -o ./build/geoip.dat https://github.com/v2ray/geoip/releases/latest/download/geoip.dat - curl -L -o ./build/geosite.dat https://github.com/v2ray/domain-list-community/releases/latest/download/dlc.dat + curl -L -o ./build/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat + curl -L -o ./build/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat - name: Smoking test if: matrix.goarch == 'amd64' && matrix.goamd64 == 'v1' diff --git a/Dockerfile b/Dockerfile index 5be0ce0fe..25b1d5f33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ RUN make OUTPUT=dae GOFLAGS="-buildvcs=false" CC=clang CGO_ENABLED=0 FROM alpine RUN mkdir -p /usr/local/share/dae/ RUN mkdir -p /etc/dae/ -RUN wget -O /usr/local/share/dae/geoip.dat https://github.com/v2rayA/dist-v2ray-rules-dat/raw/master/geoip.dat -RUN wget -O /usr/local/share/dae/geosite.dat https://github.com/v2rayA/dist-v2ray-rules-dat/raw/master/geosite.dat +RUN wget -O /usr/local/share/dae/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat +RUN wget -O /usr/local/share/dae/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat COPY --from=builder /build/dae /usr/local/bin COPY --from=builder /build/install/empty.dae /etc/dae/config.dae RUN chmod 0600 /etc/dae/config.dae diff --git a/docs/dns.md b/docs/dns.md index 6b06a0b20..e90ea15db 100644 --- a/docs/dns.md +++ b/docs/dns.md @@ -41,7 +41,7 @@ dns { # DNS request name (omit suffix dot '.'). qname(geosite:category-ads-all) -> reject - qname(geosite:google@cn) -> alidns # Also see: https://github.com/v2ray/domain-list-community#attributes + qname(geosite:google@cn) -> alidns # Also see: https://github.com/v2fly/domain-list-community#attributes qname(suffix: abc.com, keyword: google) -> googledns qname(full: ok.com, regex: '^yes') -> googledns # DNS request type diff --git a/docs/getting-started/build-by-yourself.md b/docs/getting-started/build-by-yourself.md index 9730b5759..babcf5f80 100644 --- a/docs/getting-started/build-by-yourself.md +++ b/docs/getting-started/build-by-yourself.md @@ -36,13 +36,13 @@ make GOFLAGS="-buildvcs=false" \ ### Runtime Dependencies -For traffic splitting, dae relies on the following data sources, [geoip.dat](https://github.com/v2ray/geoip/releases/latest) and [geosite.dat](https://github.com/v2fly/domain-list-community/releases/latest). +For traffic splitting, dae relies on the following data sources, [geoip.dat](https://github.com/v2fly/geoip/releases/latest) and [geosite.dat](https://github.com/v2fly/domain-list-community/releases/latest). ```shell mkdir -p /usr/local/share/dae/ pushd /usr/local/share/dae/ -curl -L -o geoip.dat https://github.com/v2ray/geoip/releases/latest/download/geoip.dat -curl -L -o geosite.dat https://github.com/v2ray/domain-list-community/releases/latest/download/dlc.dat +curl -L -o geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat +curl -L -o geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat popd ``` diff --git a/docs/getting-started/run-as-daemon.md b/docs/getting-started/run-as-daemon.md index 2748ddcaf..6af1d0e74 100644 --- a/docs/getting-started/run-as-daemon.md +++ b/docs/getting-started/run-as-daemon.md @@ -10,13 +10,13 @@ dae can run as a daemon (systemd) service so that it can run at boot. ### Optional Geo Data Files -For more convenient traffic split, dae relies on the following data sources, [geoip.dat](https://github.com/v2ray/geoip/releases/latest) and [geosite.dat](https://github.com/v2fly/domain-list-community/releases/latest). +For more convenient traffic split, dae relies on the following data sources, [geoip.dat](https://github.com/v2fly/geoip/releases/latest) and [geosite.dat](https://github.com/v2fly/domain-list-community/releases/latest). ```shell mkdir -p /usr/local/share/dae/ pushd /usr/local/share/dae/ -curl -L -o geoip.dat https://github.com/v2ray/geoip/releases/latest/download/geoip.dat -curl -L -o geosite.dat https://github.com/v2ray/domain-list-community/releases/latest/download/dlc.dat +curl -L -o geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat +curl -L -o geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat popd ```