Merge remote-tracking branch 'origin/master'
# Conflicts: # documents/donation_aff.mdpull/534/merge
mack-a
commit
c817bd0f04
|
|
@ -107,7 +107,9 @@
|
|||
|
||||
## 捐赠
|
||||
|
||||
[您可以使用我的AFF进行购买VPS捐赠](https://www.v2ray-agent.com/%E6%82%A8%E5%8F%AF%E4%BB%A5%E9%80%9A%E8%BF%87%E6%88%91%E7%9A%84AFF%E8%B4%AD%E4%B9%B0vps%E6%8D%90%E8%B5%A0)
|
||||
[您可以使用我的AFF进行购买VPS捐赠-博客](https://www.v2ray-agent.com/%E6%82%A8%E5%8F%AF%E4%BB%A5%E9%80%9A%E8%BF%87%E6%88%91%E7%9A%84AFF%E8%B4%AD%E4%B9%B0vps%E6%8D%90%E8%B5%A0)
|
||||
|
||||
[您可以使用我的AFF进行购买VPS捐赠-Github](https://github.com/mack-a/v2ray-agent/blob/master/documents/donation_aff.md)
|
||||
|
||||
[支持通过虚拟币向我捐赠](https://github.com/mack-a/v2ray-agent/blob/master/documents/donation.md)
|
||||
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ LAX:SimpleCloud V01 电信gia 联通AS9929|500M|1核|20G|1T|1Gbps|12 USD/月|5%
|
|||
|
||||
### 1.racknerd
|
||||
- 流量双向计费，比如3T实际可用1.5T
|
||||
- 移动走AS9808（PCCW）,线路不固定看脸
|
||||
|
||||
套餐名称|内存|CPU|硬盘(SSD)|流量|带宽|价格|推荐理由|购买链接
|
||||
---|---|---|---|---|---|---|---|---
|
||||
|
|
@ -92,9 +93,49 @@ LAX:SimpleCloud V01 电信gia 联通AS9929|500M|1核|20G|1T|1Gbps|12 USD/月|5%
|
|||
XMas Sale - 1.5GB KVM|1.5G|1核|20 GB SSD Cached RAID-10 Storage|4.5T|1Gbps|$15.71 USD|联通去程回程都走AS4837，大流量机器|[购买链接](https://my.racknerd.com/aff.php?aff=2705&pid=52)
|
||||
[6.18 SALE - 2021] 1.8 GB KVM VPS Special |1.8G|2核|18 GB Pure SSD|5T|1Gbps|$17.88 USD|联通去程回程都走AS4837，大流量机器|[购买链接](https://my.racknerd.com/aff.php?aff=2705&pid=508)
|
||||
|
||||
# 4.联通 日本软银【待更新】
|
||||
# 4.联通 日本软银
|
||||
|
||||
# 5.流媒体解锁【待更新】
|
||||
## 1.推荐理由
|
||||
- 线路一般比较稳定，延迟一般80ms以下，晚高峰基本上不丢包
|
||||
|
||||
## 2.推荐商家
|
||||
### 1.[搬瓦工](https://bandwagonhost.com/cart.php?aff=64917)
|
||||
- 老牌商家在vps圈声望比较高，非常稳定，补货后基本很快会被抢空
|
||||
- 不接受退款
|
||||
- 6.58%折扣码：BWH3HYATVBJW
|
||||
- location是【JP-Equinix Osaka Softbank】
|
||||
|
||||
套餐名称|内存|CPU|硬盘|流量|带宽|价格|购买链接
|
||||
---|---|---|---|---|---|---|---
|
||||
CN2 GIA 限量版|1G|1核|20G|500G|1Gbps|89.99 USD/年|[购买链接](https://bandwagonhost.com/aff.php?aff=64917&pid=105)
|
||||
CN2 GIA|1G|2核|20G|1T|2.5Gbps|169.99 USD/年|[购买链接](https://bandwagonhost.com/aff.php?aff=64917&pid=87)
|
||||
|
||||
### 2.Gigsgigscloud
|
||||
- 老牌商家，成立较早，工单回复慢
|
||||
- 退款需要符合条件，需耐心等待，处理比较慢
|
||||
|
||||
套餐名称|内存|CPU|硬盘|流量|带宽|价格|折扣码|购买链接
|
||||
---|---|---|---|---|---|---|---|---
|
||||
CLOUD K JP: JAPAN TOKYO SOFTBANK IP TRANSIT|512M|1核|10G|500G|100Mbps|8.2 USD/月|5% 折扣码 0P559NYMKTTW|[购买链接](https://clientarea.gigsgigscloud.com/?affid=3361)
|
||||
|
||||
# 6.全能线路推荐
|
||||
|
||||
## 1.Dmit Tokyo
|
||||
- 目前处于OpenBeta阶段，路由还在部分调整
|
||||
|
||||
### 1.推荐理由
|
||||
|
||||
- 会自动本地运营商选用最优的路由，回程比较重要，一般去程不堵
|
||||
- 例如：电信(CN2 GIA)/联通（AS9929/AS10099）/移动（CMI）
|
||||
- 建立读一下[ToS](https://www.dmit.io/pages/tos)和[AUP](https://www.dmit.io/pages/aup)
|
||||
|
||||
套餐名称|内存|CPU|硬盘|流量|带宽|价格|折扣码|购买链接
|
||||
---|---|---|---|---|---|---|---|---
|
||||
PVM.TYO.Pro.TINY|0.75G|1核|15G|300G|100Mbps|19.9 USD/月|年付八折折扣码：TYO-Pro-TINY-Open-Beta-Recur-20OFF|[购买链接](https://www.dmit.io/aff.php?aff=3084)
|
||||
PVM.TYO.Pro.STARTER|1.5G|1核|20G|500G|100Mbps|32.9 USD/月|非月付八折折扣码（支持非TYO-Pro-TINY系列）：TYO-Pro-Open-Beta-Recur-20OFF|[购买链接](https://www.dmit.io/aff.php?aff=3084)
|
||||
|
||||
|
||||
# 7.流媒体解锁
|
||||
|
||||
## 推荐商家
|
||||
### 1.[centerhop](https://my.centerhop.com/aff.php?aff=190)
|
||||
|
|
@ -104,3 +145,4 @@ XMas Sale - 1.5GB KVM|1.5G|1核|20 GB SSD Cached RAID-10 Storage|4.5T|1Gbps|$15.
|
|||
套餐名称|内存|CPU|硬盘(SSD)|流量|带宽|价格|推荐理由|购买链接
|
||||
---|---|---|---|---|---|---|---|---
|
||||
VN01-A Price|1G|1核|10G SAN|1T|10Mbps-200Mbps|$3 USD|解锁新加坡区Netflix|[购买链接](https://my.centerhop.com/aff.php?aff=190)
|
||||
|
||||
|
|
|
|||
49
install.sh
49
install.sh
|
|
@ -958,14 +958,14 @@ installTLS() {
|
|||
renewalTLS
|
||||
|
||||
if [[ -z $(find /etc/v2ray-agent/tls/ -name "${tlsDomain}.crt") ]] || [[ -z $(find /etc/v2ray-agent/tls/ -name "${tlsDomain}.key") ]] || [[ -z $(cat "/etc/v2ray-agent/tls/${tlsDomain}.crt") ]]; then
|
||||
sudo "$HOME/.acme.sh/acme.sh" --installcert -d "${tlsDomain}" --fullchainpath "/etc/v2ray-agent/tls/${tlsDomain}.crt" --keypath "/etc/v2ray-agent/tls/${tlsDomain}.key" --ecc >/dev/null
|
||||
else
|
||||
echoContent yellow " ---> 如未过期请选择[n]\n"
|
||||
read -r -p "是否重新安装？[y/n]:" reInstallStatus
|
||||
if [[ "${reInstallStatus}" == "y" ]]; then
|
||||
rm -rf /etc/v2ray-agent/tls/*
|
||||
installTLS "$1"
|
||||
fi
|
||||
sudo "$HOME/.acme.sh/acme.sh" --installcert -d "${tlsDomain}" --fullchainpath "/etc/v2ray-agent/tls/${tlsDomain}.crt" --keypath "/etc/v2ray-agent/tls/${tlsDomain}.key" --ecc >/dev/null
|
||||
else
|
||||
echoContent yellow " ---> 如未过期请选择[n]\n"
|
||||
read -r -p "是否重新安装？[y/n]:" reInstallStatus
|
||||
if [[ "${reInstallStatus}" == "y" ]]; then
|
||||
rm -rf /etc/v2ray-agent/tls/*
|
||||
installTLS "$1"
|
||||
fi
|
||||
fi
|
||||
|
||||
elif [[ -d "$HOME/.acme.sh" ]] && [[ ! -f "$HOME/.acme.sh/${tlsDomain}_ecc/${tlsDomain}.cer" || ! -f "$HOME/.acme.sh/${tlsDomain}_ecc/${tlsDomain}.key" ]]; then
|
||||
|
|
@ -2462,22 +2462,22 @@ EOF
|
|||
echoContent skyBlue "----------------------------------------------------------------------------------"
|
||||
|
||||
echoContent yellow " ---> 通用格式(VLESS+TCP+TLS/xtls-rprx-splice)"
|
||||
echoContent green " vless://${id}@${host}:${port}?encryption=none&security=xtls&type=tcp&host=${host}&headerType=none&sni=${host}&flow=xtls-rprx-splice#${email}\n"
|
||||
echoContent green " vless://${id}@${host}:${port}?encryption=none&security=xtls&type=tcp&host=${host}&headerType=none&sni=${host}&flow=xtls-rprx-splice#${email/direct/splice}\n"
|
||||
|
||||
echoContent yellow " ---> 格式化明文(VLESS+TCP+TLS/xtls-rprx-splice)"
|
||||
echoContent green " 协议类型：VLESS，地址：${host}，端口：${port}，用户ID：${id}，安全：xtls，传输方式：tcp，flow：xtls-rprx-splice，账户名:${email}\n"
|
||||
echoContent green " 协议类型：VLESS，地址：${host}，端口：${port}，用户ID：${id}，安全：xtls，传输方式：tcp，flow：xtls-rprx-splice，账户名:${email/direct/splice}\n"
|
||||
cat <<EOF >>"/etc/v2ray-agent/subscribe_tmp/${subAccount}"
|
||||
vless://${id}@${host}:${port}?encryption=none&security=xtls&type=tcp&host=${host}&headerType=none&sni=${host}&flow=xtls-rprx-splice#${email}
|
||||
vless://${id}@${host}:${port}?encryption=none&security=xtls&type=tcp&host=${host}&headerType=none&sni=${host}&flow=xtls-rprx-splice#${email/direct/splice}
|
||||
EOF
|
||||
echoContent yellow " ---> 二维码 VLESS(VLESS+TCP+TLS/xtls-rprx-splice)"
|
||||
echoContent green " https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless%3A%2F%2F${id}%40${host}%3A${port}%3Fencryption%3Dnone%26security%3Dxtls%26type%3Dtcp%26${host}%3D${host}%26headerType%3Dnone%26sni%3D${host}%26flow%3Dxtls-rprx-splice%23${email}\n"
|
||||
echoContent green " https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless%3A%2F%2F${id}%40${host}%3A${port}%3Fencryption%3Dnone%26security%3Dxtls%26type%3Dtcp%26${host}%3D${host}%26headerType%3Dnone%26sni%3D${host}%26flow%3Dxtls-rprx-splice%23${email/direct/splice}\n"
|
||||
|
||||
elif [[ "${coreInstallType}" == 2 || "${coreInstallType}" == "3" ]]; then
|
||||
echoContent yellow " ---> 通用格式(VLESS+TCP+TLS)"
|
||||
echoContent green " vless://${id}@${host}:${port}?security=tls&encryption=none&host=${host}&headerType=none&type=tcp#${email}\n"
|
||||
|
||||
echoContent yellow " ---> 格式化明文(VLESS+TCP+TLS/xtls-rprx-splice)"
|
||||
echoContent green " 协议类型：VLESS，地址：${host}，端口：${port}，用户ID：${id}，安全：tls，传输方式：tcp，账户名:${email}\n"
|
||||
echoContent green " 协议类型：VLESS，地址：${host}，端口：${port}，用户ID：${id}，安全：tls，传输方式：tcp，账户名:${email/direct/splice}\n"
|
||||
|
||||
cat <<EOF >>"/etc/v2ray-agent/subscribe_tmp/${subAccount}"
|
||||
vless://${id}@${host}:${port}?security=tls&encryption=none&host=${host}&headerType=none&type=tcp#${email}
|
||||
|
|
@ -2501,15 +2501,15 @@ EOF
|
|||
echoContent skyBlue "----------------------------------------------------------------------------------"
|
||||
|
||||
echoContent yellow " ---> 通用格式(Trojan+TCP+TLS/xtls-rprx-splice)"
|
||||
echoContent green " trojan://${id}@${host}:${port}?encryption=none&security=xtls&type=tcp&host=${host}&headerType=none&sni=${host}&flow=xtls-rprx-splice#${email}\n"
|
||||
echoContent green " trojan://${id}@${host}:${port}?encryption=none&security=xtls&type=tcp&host=${host}&headerType=none&sni=${host}&flow=xtls-rprx-splice#${email/direct/splice}\n"
|
||||
|
||||
echoContent yellow " ---> 格式化明文(Trojan+TCP+TLS/xtls-rprx-splice)"
|
||||
echoContent green " 协议类型：VLESS，地址：${host}，端口：${port}，用户ID：${id}，安全：xtls，传输方式：tcp，flow：xtls-rprx-splice，账户名:${email}\n"
|
||||
echoContent green " 协议类型：VLESS，地址：${host}，端口：${port}，用户ID：${id}，安全：xtls，传输方式：tcp，flow：xtls-rprx-splice，账户名:${email/direct/splice}\n"
|
||||
cat <<EOF >>"/etc/v2ray-agent/subscribe_tmp/${subAccount}"
|
||||
trojan://${id}@${host}:${port}?encryption=none&security=xtls&type=tcp&host=${host}&headerType=none&sni=${host}&flow=xtls-rprx-splice#${email}
|
||||
trojan://${id}@${host}:${port}?encryption=none&security=xtls&type=tcp&host=${host}&headerType=none&sni=${host}&flow=xtls-rprx-splice#${email/direct/splice}
|
||||
EOF
|
||||
echoContent yellow " ---> 二维码 Trojan(Trojan+TCP+TLS/xtls-rprx-splice)"
|
||||
echoContent green " https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=trojan%3A%2F%2F${id}%40${host}%3A${port}%3Fencryption%3Dnone%26security%3Dxtls%26type%3Dtcp%26${host}%3D${host}%26headerType%3Dnone%26sni%3D${host}%26flow%3Dxtls-rprx-splice%23${email}\n"
|
||||
echoContent green " https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=trojan%3A%2F%2F${id}%40${host}%3A${port}%3Fencryption%3Dnone%26security%3Dxtls%26type%3Dtcp%26${host}%3D${host}%26headerType%3Dnone%26sni%3D${host}%26flow%3Dxtls-rprx-splice%23${email/direct/splice}\n"
|
||||
|
||||
elif [[ "${type}" == "vmessws" ]]; then
|
||||
qrCodeBase64Default=$(echo -n "{\"port\":${port},\"ps\":\"${email}\",\"tls\":\"tls\",\"id\":\"${id}\",\"aid\":0,\"v\":2,\"host\":\"${host}\",\"type\":\"none\",\"path\":\"/${path}\",\"net\":\"ws\",\"add\":\"${add}\",\"allowInsecure\":0,\"method\":\"none\",\"peer\":\"${host}\",\"sni\":\"${host}\"}" | base64 -w 0)
|
||||
|
|
@ -2827,13 +2827,18 @@ unInstall() {
|
|||
|
||||
handleV2Ray stop
|
||||
# handleTrojanGo stop
|
||||
|
||||
if [[ -f "/root/.acme.sh/acme.sh.env" ]] && grep -q 'acme.sh.env' </root/.bashrc; then
|
||||
sed -i 's/. "\/root\/.acme.sh\/acme.sh.env"//g' "$(grep '. "/root/.acme.sh/acme.sh.env"' -rl /root/.bashrc)"
|
||||
fi
|
||||
rm -rf /root/.acme.sh
|
||||
echoContent green " ---> 删除acme.sh完成"
|
||||
rm -rf /etc/systemd/system/v2ray.service
|
||||
echoContent green " ---> 删除V2Ray开机自启完成"
|
||||
|
||||
rm -rf /etc/systemd/system/trojan-go.service
|
||||
echoContent green " ---> 删除Trojan-Go开机自启完成"
|
||||
# rm -rf /etc/systemd/system/trojan-go.service
|
||||
# echoContent green " ---> 删除Trojan-Go开机自启完成"
|
||||
|
||||
rm -rf /tmp/v2ray-agent-tls/*
|
||||
if [[ -d "/etc/v2ray-agent/tls" ]] && [[ -n $(find /etc/v2ray-agent/tls/ -name "*.key") ]] && [[ -n $(find /etc/v2ray-agent/tls/ -name "*.crt") ]]; then
|
||||
mv /etc/v2ray-agent/tls /tmp/v2ray-agent-tls
|
||||
|
|
@ -3275,7 +3280,9 @@ aliasInstall() {
|
|||
|
||||
# 检查ipv6、ipv4
|
||||
checkIPv6() {
|
||||
pingIPv6=$(ping6 -c 1 www.google.com | sed '2{s/[^(]*(//;s/).*//;q;}' | tail -n +2)
|
||||
# pingIPv6=$(ping6 -c 1 www.google.com | sed '2{s/[^(]*(//;s/).*//;q;}' | tail -n +2)
|
||||
pingIPv6=$(ping6 -c 1 www.google.com | sed -n '1p' | sed 's/.*(//g;s/).*//g')
|
||||
|
||||
if [[ -z "${pingIPv6}" ]]; then
|
||||
echoContent red " ---> 不支持ipv6"
|
||||
exit 0
|
||||
|
|
@ -4268,7 +4275,7 @@ menu() {
|
|||
cd "$HOME" || exit
|
||||
echoContent red "\n=============================================================="
|
||||
echoContent green "作者：mack-a"
|
||||
echoContent green "当前版本：v2.5.36"
|
||||
echoContent green "当前版本：v2.5.38"
|
||||
echoContent green "Github：https://github.com/mack-a/v2ray-agent"
|
||||
echoContent green "描述：八合一共存脚本\c"
|
||||
showInstallStatus
|
||||
|
|
|
|||
Loading…
Reference in New Issue