Merge pull request #152 from v2fly/develop
IceCodeNew
GitHub
commit
19dd8504a3
10
README.md
10
README.md
|
|
@ -27,28 +27,26 @@ installed: /etc/systemd/system/v2ray@.service
|
|||
|
||||
## 使用
|
||||
|
||||
* 該腳本在執行時會提供 `info` 和 `error` 等信息，請仔細閱讀。
|
||||
* 該腳本在執行時會提供 `info`、`warning` 和 `error` 等信息，請仔細閱讀。
|
||||
|
||||
### 安裝和更新 V2Ray
|
||||
|
||||
```
|
||||
// 安裝執行檔和 .dat 資料檔
|
||||
# curl -LROJ https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh
|
||||
# bash install-release.sh
|
||||
# bash <(curl -H 'Cache-Control: no-cache' -L https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh)
|
||||
```
|
||||
|
||||
### 安裝最新發行的 geoip.dat 和 geosite.dat
|
||||
|
||||
```
|
||||
// 只更新 .dat 資料檔
|
||||
# curl -LROJ https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-dat-release.sh
|
||||
# bash install-dat-release.sh
|
||||
# bash <(curl -H 'Cache-Control: no-cache' -L https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-dat-release.sh)
|
||||
```
|
||||
|
||||
### 移除 V2Ray
|
||||
|
||||
```
|
||||
# bash install-release.sh --remove
|
||||
# bash <(curl -H 'Cache-Control: no-cache' -L https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh) --remove
|
||||
```
|
||||
|
||||
### 解決問題
|
||||
|
|
|
|||
|
|
@ -27,28 +27,26 @@ installed: /etc/systemd/system/v2ray@.service
|
|||
|
||||
## 使用
|
||||
|
||||
* 该脚本在运行时会提供 `info` 和 `error` 等信息，请仔细阅读。
|
||||
* 该脚本在运行时会提供 `info`、`warning` 和 `error` 等信息，请仔细阅读。
|
||||
|
||||
### 安装和更新 V2Ray
|
||||
|
||||
```
|
||||
// 安装可执行文件和 .dat 数据文件
|
||||
# curl -LROJ https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh
|
||||
# bash install-release.sh
|
||||
# bash <(curl -H 'Cache-Control: no-cache' -L https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh)
|
||||
```
|
||||
|
||||
### 安装最新发行的 geoip.dat 和 geosite.dat
|
||||
|
||||
```
|
||||
// 只更新 .dat 数据文件
|
||||
# curl -LROJ https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-dat-release.sh
|
||||
# bash install-dat-release.sh
|
||||
# bash <(curl -H 'Cache-Control: no-cache' -L https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-dat-release.sh)
|
||||
```
|
||||
|
||||
### 移除 V2Ray
|
||||
|
||||
```
|
||||
# bash install-release.sh --remove
|
||||
# bash <(curl -H 'Cache-Control: no-cache' -L https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh) --remove
|
||||
```
|
||||
|
||||
### 解决问题
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@ JSON_PATH=${JSON_PATH:-/usr/local/etc/v2ray}
|
|||
# Set this variable only if you are starting v2ray with multiple configuration files:
|
||||
# export JSONS_PATH='/usr/local/etc/v2ray'
|
||||
|
||||
# Set this variable only if you want this script to check all the systemd unit file:
|
||||
# export check_all_service_files='yes'
|
||||
|
||||
curl() {
|
||||
$(type -P curl) -L -q --retry 5 --retry-delay 10 --retry-max-time 60 "$@"
|
||||
}
|
||||
|
|
@ -362,37 +365,39 @@ install_startup_service_file() {
|
|||
mkdir -p '/etc/systemd/system/v2ray.service.d'
|
||||
mkdir -p '/etc/systemd/system/v2ray@.service.d/'
|
||||
if [[ -n "$JSONS_PATH" ]]; then
|
||||
echo "# Duplicate this file in the same directory and make your customizes there. Or all changes you made will be lost!
|
||||
## Refer: https://www.freedesktop.org/software/systemd/man/systemd.unit.html
|
||||
"rm" '/etc/systemd/system/v2ray.service.d/10-donot_touch_single_conf.conf' \
|
||||
'/etc/systemd/system/v2ray@.service.d/10-donot_touch_single_conf.conf'
|
||||
echo "# In case you have a good reason to do so, duplicate this file in the same directory and make your customizes there.
|
||||
# Or all changes you made will be lost! # Refer: https://www.freedesktop.org/software/systemd/man/systemd.unit.html
|
||||
[Service]
|
||||
ExecStart=
|
||||
ExecStart=/usr/local/bin/v2ray -confdir $JSONS_PATH" |
|
||||
tee '/etc/systemd/system/v2ray.service.d/10-donot_touch_multi_conf.conf' > \
|
||||
'/etc/systemd/system/v2ray@.service.d/10-donot_touch_multi_conf.conf'
|
||||
else
|
||||
echo "${red}~~~~~~~~~~~~~~~~ ${green}/etc/systemd/system/v2ray.service.d/10-donot_touch_single_conf ${red}~~~~~~~~~~~~~~~~${reset}"
|
||||
echo 'info: The following are the actual parameters for the v2ray service startup.'
|
||||
echo 'info: Please make sure the configuration file path is correctly set.'
|
||||
echo "# Duplicate this file in the same directory and make your customizes there. Or all changes you made will be lost!
|
||||
## Refer: https://www.freedesktop.org/software/systemd/man/systemd.unit.html
|
||||
"rm" '/etc/systemd/system/v2ray.service.d/10-donot_touch_multi_conf.conf' \
|
||||
'/etc/systemd/system/v2ray@.service.d/10-donot_touch_multi_conf.conf'
|
||||
echo "# In case you have a good reason to do so, duplicate this file in the same directory and make your customizes there.
|
||||
# Or all changes you made will be lost! # Refer: https://www.freedesktop.org/software/systemd/man/systemd.unit.html
|
||||
[Service]
|
||||
ExecStart=
|
||||
ExecStart=/usr/local/bin/v2ray -config ${JSON_PATH}/config.json" |
|
||||
tee '/etc/systemd/system/v2ray.service.d/10-donot_touch_single_conf.conf'
|
||||
echo
|
||||
echo
|
||||
|
||||
echo "${red}~~~~~~~~~~~~~~~~ ${green}/etc/systemd/system/v2ray@.service.d/10-donot_touch_single_conf ${red}~~~~~~~~~~~~~~~~${reset}"
|
||||
echo 'info: The following are the actual parameters for the v2ray service startup.'
|
||||
echo 'info: Please make sure the configuration file path is correctly set.'
|
||||
echo "# Duplicate this file in the same directory and make your customizes there. Or all changes you made will be lost!
|
||||
## Refer: https://www.freedesktop.org/software/systemd/man/systemd.unit.html
|
||||
ExecStart=/usr/local/bin/v2ray -config ${JSON_PATH}/config.json" > \
|
||||
'/etc/systemd/system/v2ray.service.d/10-donot_touch_single_conf.conf'
|
||||
echo "# In case you have a good reason to do so, duplicate this file in the same directory and make your customizes there.
|
||||
# Or all changes you made will be lost! # Refer: https://www.freedesktop.org/software/systemd/man/systemd.unit.html
|
||||
[Service]
|
||||
ExecStart=
|
||||
ExecStart=/usr/local/bin/v2ray -config ${JSON_PATH}/%i.json" |
|
||||
tee '/etc/systemd/system/v2ray@.service.d/10-donot_touch_single_conf.conf'
|
||||
ExecStart=/usr/local/bin/v2ray -config ${JSON_PATH}/%i.json" > \
|
||||
'/etc/systemd/system/v2ray@.service.d/10-donot_touch_single_conf.conf'
|
||||
fi
|
||||
echo "info: Systemd service files have been installed successfully!"
|
||||
echo "${red}warning: ${green}The following are the actual parameters for the v2ray service startup."
|
||||
echo "${red}warning: ${green}Please make sure the configuration file path is correctly set.${reset}"
|
||||
systemd-analyze cat-config /etc/systemd/system/v2ray.service
|
||||
if [[ x"${check_all_service_files:0:1}" = x'y' ]]; then
|
||||
echo
|
||||
echo
|
||||
systemd-analyze cat-config /etc/systemd/system/v2ray@.service
|
||||
fi
|
||||
systemctl daemon-reload
|
||||
SYSTEMD='1'
|
||||
|
|
@ -515,7 +520,7 @@ main() {
|
|||
if [[ "$LOCAL_INSTALL" -eq '1' ]]; then
|
||||
echo 'warn: Install V2Ray from a local file, but still need to make sure the network is available.'
|
||||
echo -n 'warn: Please make sure the file is valid because we cannot confirm it. (Press any key) ...'
|
||||
read
|
||||
read -r
|
||||
install_software "$package_provide_bsdtar" 'bsdtar'
|
||||
decompression "$LOCAL_FILE"
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in New Issue