mirror of
https://github.com/daeuniverse/dae.git
synced 2025-07-06 00:09:37 +07:00
chore(geodata): change back to v2fly geodata (#168)
This commit is contained in:
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -122,8 +122,8 @@ jobs:
|
|||||||
make
|
make
|
||||||
cp ./install/dae.service ./build/
|
cp ./install/dae.service ./build/
|
||||||
cp ./example.dae ./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/geoip.dat https://github.com/v2fly/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/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat
|
||||||
|
|
||||||
- name: Smoking test
|
- name: Smoking test
|
||||||
if: matrix.goarch == 'amd64' && matrix.goamd64 == 'v1'
|
if: matrix.goarch == 'amd64' && matrix.goamd64 == 'v1'
|
||||||
|
4
.github/workflows/prerelease.yml
vendored
4
.github/workflows/prerelease.yml
vendored
@ -110,8 +110,8 @@ jobs:
|
|||||||
make
|
make
|
||||||
cp ./install/dae.service ./build/
|
cp ./install/dae.service ./build/
|
||||||
cp ./example.dae ./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/geoip.dat https://github.com/v2fly/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/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat
|
||||||
|
|
||||||
- name: Smoking test
|
- name: Smoking test
|
||||||
if: matrix.goarch == 'amd64' && matrix.goamd64 == 'v1'
|
if: matrix.goarch == 'amd64' && matrix.goamd64 == 'v1'
|
||||||
|
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
@ -110,8 +110,8 @@ jobs:
|
|||||||
make
|
make
|
||||||
cp ./install/dae.service ./build/
|
cp ./install/dae.service ./build/
|
||||||
cp ./example.dae ./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/geoip.dat https://github.com/v2fly/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/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat
|
||||||
|
|
||||||
- name: Smoking test
|
- name: Smoking test
|
||||||
if: matrix.goarch == 'amd64' && matrix.goamd64 == 'v1'
|
if: matrix.goarch == 'amd64' && matrix.goamd64 == 'v1'
|
||||||
|
@ -10,8 +10,8 @@ RUN make OUTPUT=dae GOFLAGS="-buildvcs=false" CC=clang CGO_ENABLED=0
|
|||||||
FROM alpine
|
FROM alpine
|
||||||
RUN mkdir -p /usr/local/share/dae/
|
RUN mkdir -p /usr/local/share/dae/
|
||||||
RUN mkdir -p /etc/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/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/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/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/dae /usr/local/bin
|
||||||
COPY --from=builder /build/install/empty.dae /etc/dae/config.dae
|
COPY --from=builder /build/install/empty.dae /etc/dae/config.dae
|
||||||
RUN chmod 0600 /etc/dae/config.dae
|
RUN chmod 0600 /etc/dae/config.dae
|
||||||
|
@ -41,7 +41,7 @@ dns {
|
|||||||
|
|
||||||
# DNS request name (omit suffix dot '.').
|
# DNS request name (omit suffix dot '.').
|
||||||
qname(geosite:category-ads-all) -> reject
|
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(suffix: abc.com, keyword: google) -> googledns
|
||||||
qname(full: ok.com, regex: '^yes') -> googledns
|
qname(full: ok.com, regex: '^yes') -> googledns
|
||||||
# DNS request type
|
# DNS request type
|
||||||
|
@ -36,13 +36,13 @@ make GOFLAGS="-buildvcs=false" \
|
|||||||
|
|
||||||
### Runtime Dependencies
|
### 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
|
```shell
|
||||||
mkdir -p /usr/local/share/dae/
|
mkdir -p /usr/local/share/dae/
|
||||||
pushd /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 geoip.dat https://github.com/v2fly/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 geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat
|
||||||
popd
|
popd
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -10,13 +10,13 @@ dae can run as a daemon (systemd) service so that it can run at boot.
|
|||||||
|
|
||||||
### Optional Geo Data Files
|
### 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
|
```shell
|
||||||
mkdir -p /usr/local/share/dae/
|
mkdir -p /usr/local/share/dae/
|
||||||
pushd /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 geoip.dat https://github.com/v2fly/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 geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat
|
||||||
popd
|
popd
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user