From e6bd2e5f2113de3761965e8d0eddd101a9a4a6e9 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 15 Aug 2020 16:55:02 +0800 Subject: [PATCH] fix: A wrong installation path 1. Move the .dat file from the lib directory to the share directory. issue #17 --- README.md | 4 ++-- install-dat-release.sh | 4 ++-- install-release.sh | 4 ++-- systemd/system/v2ray.service | 2 +- systemd/system/v2ray@.service | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4701298..28352f6 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ https://wiki.linuxfoundation.org/lsb/fhs ``` installed: /usr/local/bin/v2ray installed: /usr/local/bin/v2ctl -installed: /usr/local/lib/v2ray/geoip.dat -installed: /usr/local/lib/v2ray/geosite.dat +installed: /usr/local/share/v2ray/geoip.dat +installed: /usr/local/share/v2ray/geosite.dat installed: /usr/local/etc/v2ray/00_log.json installed: /usr/local/etc/v2ray/01_api.json installed: /usr/local/etc/v2ray/02_dns.json diff --git a/install-dat-release.sh b/install-dat-release.sh index 3ab3ad3..28b72c8 100644 --- a/install-dat-release.sh +++ b/install-dat-release.sh @@ -13,8 +13,8 @@ # 0 0 * * * /usr/local/bin/install-dat-release > /dev/null 2>&1 -# You can modify it to /usr/local/share/v2ray/ -V2RAY="/usr/local/lib/v2ray/" +# You can modify it to /usr/local/lib/v2ray/ +V2RAY="/usr/local/share/v2ray/" DOWNLOAD_LINK_GEOIP="https://github.com/v2ray/geoip/releases/latest/download/geoip.dat" DOWNLOAD_LINK_GEOSITE="https://github.com/v2ray/domain-list-community/releases/latest/download/dlc.dat" diff --git a/install-release.sh b/install-release.sh index a16aa3d..93ed38d 100644 --- a/install-release.sh +++ b/install-release.sh @@ -13,8 +13,8 @@ # https://github.com/v2fly/fhs-install-v2ray/issues # If you modify the following variables, you also need to modify the unit file yourself: -# You can modify it to /usr/local/share/v2ray/ -DAT_PATH='/usr/local/lib/v2ray/' +# You can modify it to /usr/local/lib/v2ray/ +DAT_PATH='/usr/local/share/v2ray/' # You can modify it to /etc/v2ray/ JSON_PATH='/usr/local/etc/v2ray/' diff --git a/systemd/system/v2ray.service b/systemd/system/v2ray.service index 4d49a2b..e9d6310 100644 --- a/systemd/system/v2ray.service +++ b/systemd/system/v2ray.service @@ -7,7 +7,7 @@ User=nobody CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE NoNewPrivileges=true -Environment=V2RAY_LOCATION_ASSET=/usr/local/lib/v2ray/ +Environment=V2RAY_LOCATION_ASSET=/usr/local/share/v2ray/ ExecStart=/usr/local/bin/v2ray -confdir /usr/local/etc/v2ray/ Restart=on-failure diff --git a/systemd/system/v2ray@.service b/systemd/system/v2ray@.service index 65e38f1..8455d9d 100644 --- a/systemd/system/v2ray@.service +++ b/systemd/system/v2ray@.service @@ -7,7 +7,7 @@ User=nobody CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE NoNewPrivileges=true -Environment=V2RAY_LOCATION_ASSET=/usr/local/lib/v2ray/ +Environment=V2RAY_LOCATION_ASSET=/usr/local/share/v2ray/ ExecStart=/usr/local/bin/v2ray -config /usr/local/etc/v2ray/%i.json Restart=on-failure