Merge pull request #1 from 233boy/master

Master
pull/244/head
skysound 6 years ago committed by GitHub
commit d2ec69e62d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/ISSUE_TEMPLATE.md
  2. 2
      config/server/include/socks.json
  3. 37
      install.sh
  4. 20
      src/bbr.sh
  5. 2
      src/client_file.sh
  6. 6
      src/download-caddy.sh
  7. 1
      src/download-v2ray.sh
  8. 6
      src/init.sh
  9. 4
      src/qr.sh
  10. 2
      src/socks-config.sh
  11. 2
      src/ss-info.sh
  12. 2
      src/uninstall.sh
  13. 4
      src/v2ray-info.sh
  14. 2
      templates/socks.json
  15. 49
      v2ray.sh

@ -1,3 +1,3 @@
提问之前,请先查阅:[V2Ray 一键安装脚本疑问集合](https://v2ray6.com/post/10/) 提问之前,请先查阅:[V2Ray 一键安装脚本疑问集合](https://233v2.com/post/10/)
若需要发起提问,请删除这些内容 若需要发起提问,请删除这些内容

@ -5,7 +5,7 @@
"auth": "password", "auth": "password",
"accounts": [ "accounts": [
{ {
"user": "v2ray66.com", "user": "233v2.com",
"pass": "233blog.com" "pass": "233blog.com"
} }
], ],

@ -6,6 +6,11 @@ yellow='\e[93m'
magenta='\e[95m' magenta='\e[95m'
cyan='\e[96m' cyan='\e[96m'
none='\e[0m' none='\e[0m'
_red() { echo -e ${red}$*${none}; }
_green() { echo -e ${green}$*${none}; }
_yellow() { echo -e ${yellow}$*${none}; }
_magenta() { echo -e ${magenta}$*${none}; }
_cyan() { echo -e ${cyan}$*${none}; }
# Root # Root
[[ $(id -u) != 0 ]] && echo -e "\n 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}\n" && exit 1 [[ $(id -u) != 0 ]] && echo -e "\n 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}\n" && exit 1
@ -745,7 +750,7 @@ install_v2ray() {
echo echo
echo -e "$red 哎呀呀...安装失败了咯...$none" echo -e "$red 哎呀呀...安装失败了咯...$none"
echo echo
echo -e " 请确保你有完整的上传 v2ray6.com 的 V2Ray 一键安装脚本 & 管理脚本到当前 ${green}$(pwd) $none目录下" echo -e " 请确保你有完整的上传 233v2.com 的 V2Ray 一键安装脚本 & 管理脚本到当前 ${green}$(pwd) $none目录下"
echo echo
exit 1 exit 1
fi fi
@ -753,7 +758,7 @@ install_v2ray() {
cp -rf $(pwd)/* /etc/v2ray/233boy/v2ray cp -rf $(pwd)/* /etc/v2ray/233boy/v2ray
else else
pushd /tmp pushd /tmp
git clone https://github.com/233boy/v2ray -b "$_gitbranch" /etc/v2ray/233boy/v2ray git clone https://github.com/233boy/v2ray -b "$_gitbranch" /etc/v2ray/233boy/v2ray --depth=1
popd popd
fi fi
@ -907,20 +912,6 @@ backup_config() {
fi fi
} }
try_enable_bbr() {
if [[ $(uname -r | cut -b 1) -eq 4 ]]; then
case $(uname -r | cut -b 3-4) in
9. | [1-9][0-9])
sed -i '/net.ipv4.tcp_congestion_control/d' /etc/sysctl.conf
sed -i '/net.core.default_qdisc/d' /etc/sysctl.conf
echo "net.ipv4.tcp_congestion_control = bbr" >>/etc/sysctl.conf
echo "net.core.default_qdisc = fq" >>/etc/sysctl.conf
sysctl -p >/dev/null 2>&1
;;
esac
fi
}
get_ip() { get_ip() {
ip=$(curl -s https://ipinfo.io/ip) ip=$(curl -s https://ipinfo.io/ip)
[[ -z $ip ]] && ip=$(curl -s https://api.ip.sb/ip) [[ -z $ip ]] && ip=$(curl -s https://api.ip.sb/ip)
@ -980,7 +971,6 @@ install() {
blocked_hosts blocked_hosts
shadowsocks_config shadowsocks_config
install_info install_info
try_enable_bbr
# [[ $caddy ]] && domain_check # [[ $caddy ]] && domain_check
install_v2ray install_v2ray
if [[ $caddy || $v2ray_port == "80" ]]; then if [[ $caddy || $v2ray_port == "80" ]]; then
@ -993,6 +983,11 @@ install() {
fi fi
fi fi
[[ $caddy ]] && install_caddy [[ $caddy ]] && install_caddy
## bbr
_load bbr.sh
_try_enable_bbr
get_ip get_ip
config config
show_config_info show_config_info
@ -1017,7 +1012,7 @@ uninstall() {
echo -e " echo -e "
$red 大胸弟...你貌似毛有安装 V2Ray ....卸载个鸡鸡哦...$none $red 大胸弟...你貌似毛有安装 V2Ray ....卸载个鸡鸡哦...$none
备注...仅支持卸载使用我 (v2ray6.com) 提供的 V2Ray 一键安装脚本 备注...仅支持卸载使用我 (233v2.com) 提供的 V2Ray 一键安装脚本
" && exit 1 " && exit 1
fi fi
@ -1051,11 +1046,11 @@ esac
clear clear
while :; do while :; do
echo echo
echo "........... V2Ray 一键安装脚本 & 管理脚本 by v2ray6.com .........." echo "........... V2Ray 一键安装脚本 & 管理脚本 by 233v2.com .........."
echo echo
echo "帮助说明: https://v2ray6.com/post/1/" echo "帮助说明: https://233v2.com/post/1/"
echo echo
echo "搭建教程: https://v2ray6.com/post/2/" echo "搭建教程: https://233v2.com/post/2/"
echo echo
echo " 1. 安装" echo " 1. 安装"
echo echo

@ -0,0 +1,20 @@
_open_bbr() {
sed -i '/net.ipv4.tcp_congestion_control/d' /etc/sysctl.conf
sed -i '/net.core.default_qdisc/d' /etc/sysctl.conf
echo "net.ipv4.tcp_congestion_control = bbr" >>/etc/sysctl.conf
echo "net.core.default_qdisc = fq" >>/etc/sysctl.conf
sysctl -p >/dev/null 2>&1
echo
_green "..由于你的 VPS 内核支持开启 BBR ...已经为你启用 BBR 优化...."
echo
}
_try_enable_bbr() {
local _test1=$(uname -r | cut -d\. -f1)
local _test2=$(uname -r | cut -d\. -f2)
if [[ $_test1 -eq 4 && $_test2 -ge 9 ]] || [[ $_test1 -ge 5 ]]; then
_open_bbr
enable_bbr=true
fi
}

@ -6,7 +6,7 @@ _get_client_file() {
echo echo
echo -e ${cyan}$link${none} echo -e ${cyan}$link${none}
echo echo
echo " V2Ray 客户端使用教程: https://v2ray6.com/post/4/" echo " V2Ray 客户端使用教程: https://233v2.com/post/4/"
echo echo
echo echo
} }

@ -27,6 +27,7 @@ _install_caddy_service() {
if [[ $systemd ]]; then if [[ $systemd ]]; then
cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/ cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/
# sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service
sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service
sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service
systemctl enable caddy systemctl enable caddy
else else
@ -44,4 +45,7 @@ _install_caddy_service() {
chown -R www-data.www-data /etc/ssl/caddy chown -R www-data.www-data /etc/ssl/caddy
mkdir -p /etc/caddy/ mkdir -p /etc/caddy/
}
## create sites dir
mkdir -p /etc/caddy/sites
}

@ -30,6 +30,7 @@ _download_v2ray_file() {
mkdir -p /usr/bin/v2ray mkdir -p /usr/bin/v2ray
cp -f "/tmp/v2ray/v2ray" "/usr/bin/v2ray/v2ray" cp -f "/tmp/v2ray/v2ray" "/usr/bin/v2ray/v2ray"
chmod +x "/usr/bin/v2ray/v2ray" chmod +x "/usr/bin/v2ray/v2ray"
echo "alias v2ray=$_v2ray_sh" >>/root/.bashrc
cp -f "/tmp/v2ray/v2ctl" "/usr/bin/v2ray/v2ctl" cp -f "/tmp/v2ray/v2ctl" "/usr/bin/v2ray/v2ctl"
chmod +x "/usr/bin/v2ray/v2ctl" chmod +x "/usr/bin/v2ray/v2ctl"
} }

@ -1,3 +1,9 @@
_red() { echo -e ${red}$*${none}; }
_green() { echo -e ${green}$*${none}; }
_yellow() { echo -e ${yellow}$*${none}; }
_magenta() { echo -e ${magenta}$*${none}; }
_cyan() { echo -e ${cyan}$*${none}; }
_rm() { _rm() {
rm -rf "$@" rm -rf "$@"
} }

@ -10,13 +10,13 @@ _qr_create() {
echo -e "$red 友情提醒: 请务必核对扫码结果 (V2RayNG 除外) $none" echo -e "$red 友情提醒: 请务必核对扫码结果 (V2RayNG 除外) $none"
echo echo
echo echo
echo " V2Ray 客户端使用教程: https://v2ray6.com/post/4/" echo " V2Ray 客户端使用教程: https://233v2.com/post/4/"
echo echo
echo echo
rm -rf /etc/v2ray/vmess_qr.json rm -rf /etc/v2ray/vmess_qr.json
} }
_ss_qr() { _ss_qr() {
local ss_link="ss://$(echo -n "${ssciphers}:${sspass}@${ip}:${ssport}" | base64 -w 0)#v2ray6.com_ss_${ip}" local ss_link="ss://$(echo -n "${ssciphers}:${sspass}@${ip}:${ssport}" | base64 -w 0)#233v2.com_ss_${ip}"
local link="https://233boy.github.io/tools/qr.html#${ss_link}" local link="https://233boy.github.io/tools/qr.html#${ss_link}"
echo echo
echo "---------- Shadowsocks 二维码链接 -------------" echo "---------- Shadowsocks 二维码链接 -------------"

@ -3,7 +3,7 @@ if [[ $socks ]]; then
socks_file="/etc/v2ray/233boy/v2ray/config/server/include/socks.json" socks_file="/etc/v2ray/233boy/v2ray/config/server/include/socks.json"
socks_file_tmp="/tmp/socks.json.tmp" socks_file_tmp="/tmp/socks.json.tmp"
cp -f $socks_file $socks_file_tmp cp -f $socks_file $socks_file_tmp
sed -i "s/6666/$socks_port/; s/v2ray66.com/$socks_username/; s/233blog.com/$socks_userpass/" $socks_file_tmp sed -i "s/6666/$socks_port/; s/233v2.com/$socks_username/; s/233blog.com/$socks_userpass/" $socks_file_tmp
sed -i "/\/\/include_socks/r $socks_file_tmp" $v2ray_server_config sed -i "/\/\/include_socks/r $socks_file_tmp" $v2ray_server_config
sed -i "s#//include_socks#,#" $v2ray_server_config sed -i "s#//include_socks#,#" $v2ray_server_config
rm -rf $socks_file_tmp rm -rf $socks_file_tmp

@ -1,6 +1,6 @@
[[ -z $ip ]] && get_ip [[ -z $ip ]] && get_ip
if [[ $shadowsocks ]]; then if [[ $shadowsocks ]]; then
local ss="ss://$(echo -n "${ssciphers}:${sspass}@${ip}:${ssport}" | base64 -w 0)#v2ray6.com_ss_${ip}" local ss="ss://$(echo -n "${ssciphers}:${sspass}@${ip}:${ssport}" | base64 -w 0)#233v2.com_ss_${ip}"
echo echo
echo "---------- Shadowsocks 配置信息 -------------" echo "---------- Shadowsocks 配置信息 -------------"
echo echo

@ -86,6 +86,7 @@ if [[ $is_uninstall_v2ray && $is_uninstall_caddy ]]; then
rm -rf /usr/bin/v2ray rm -rf /usr/bin/v2ray
rm -rf $_v2ray_sh rm -rf $_v2ray_sh
sed -i '/alias v2ray=/d' /root/.bashrc
rm -rf /etc/v2ray rm -rf /etc/v2ray
rm -rf /var/log/v2ray rm -rf /var/log/v2ray
@ -148,6 +149,7 @@ elif [[ $is_uninstall_v2ray ]]; then
rm -rf /usr/bin/v2ray rm -rf /usr/bin/v2ray
rm -rf $_v2ray_sh rm -rf $_v2ray_sh
sed -i '/alias v2ray=/d' /root/.bashrc
rm -rf /etc/v2ray rm -rf /etc/v2ray
rm -rf /var/log/v2ray rm -rf /var/log/v2ray
if [[ $systemd ]]; then if [[ $systemd ]]; then

@ -77,7 +77,7 @@ _v2_info() {
if [[ $v2ray_transport == [45] ]]; then if [[ $v2ray_transport == [45] ]]; then
if [[ ! $caddy ]]; then if [[ ! $caddy ]]; then
echo echo
echo -e " $red警告$none$yellow请自行配置 TLS...教程: https://v2ray6.com/post/3/$none" echo -e " $red警告$none$yellow请自行配置 TLS...教程: https://233v2.com/post/3/$none"
fi fi
echo echo
echo -e "$yellow 地址 (Address) = $cyan${domain}$none" echo -e "$yellow 地址 (Address) = $cyan${domain}$none"
@ -129,7 +129,7 @@ _v2_info() {
fi fi
echo "---------- END -------------" echo "---------- END -------------"
echo echo
echo "V2Ray 客户端使用教程: https://v2ray6.com/post/4/" echo "V2Ray 客户端使用教程: https://233v2.com/post/4/"
echo echo
echo -e "提示: 输入$cyan v2ray url $none可生成 vmess URL 链接 / 输入$cyan v2ray qr $none可生成二维码链接" echo -e "提示: 输入$cyan v2ray url $none可生成 vmess URL 链接 / 输入$cyan v2ray qr $none可生成二维码链接"
echo echo

@ -5,7 +5,7 @@
"auth": "password", "auth": "password",
"accounts": [ "accounts": [
{ {
"user": "v2ray66.com", // username "user": "233v2.com", // username
"pass": "233blog.com" // passowrd "pass": "233blog.com" // passowrd
} }
], ],

@ -110,7 +110,7 @@ create_vmess_URL_config() {
cat >/etc/v2ray/vmess_qr.json <<-EOF cat >/etc/v2ray/vmess_qr.json <<-EOF
{ {
"v": "2", "v": "2",
"ps": "v2ray6.com_${domain}", "ps": "233v2.com_${domain}",
"add": "${domain}", "add": "${domain}",
"port": "443", "port": "443",
"id": "${v2ray_id}", "id": "${v2ray_id}",
@ -127,7 +127,7 @@ create_vmess_URL_config() {
cat >/etc/v2ray/vmess_qr.json <<-EOF cat >/etc/v2ray/vmess_qr.json <<-EOF
{ {
"v": "2", "v": "2",
"ps": "v2ray6.com_${ip}", "ps": "233v2.com_${ip}",
"add": "${ip}", "add": "${ip}",
"port": "${v2ray_port}", "port": "${v2ray_port}",
"id": "${v2ray_id}", "id": "${v2ray_id}",
@ -2133,7 +2133,7 @@ get_v2ray_config() {
echo echo
echo -e "${yellow} HTTP 监听端口 = ${cyan}6666$none" echo -e "${yellow} HTTP 监听端口 = ${cyan}6666$none"
echo echo
echo "V2Ray 客户端使用教程: https://v2ray6.com/post/4/" echo "V2Ray 客户端使用教程: https://233v2.com/post/4/"
echo echo
break break
else else
@ -2158,7 +2158,7 @@ create_v2ray_config_text() {
if [[ $v2ray_transport == [45] ]]; then if [[ $v2ray_transport == [45] ]]; then
if [[ ! $caddy ]]; then if [[ ! $caddy ]]; then
echo echo
echo " 警告!请自行配置 TLS...教程: https://v2ray6.com/post/3/" echo " 警告!请自行配置 TLS...教程: https://233v2.com/post/3/"
fi fi
echo echo
echo "地址 (Address) = ${domain}" echo "地址 (Address) = ${domain}"
@ -2211,7 +2211,7 @@ create_v2ray_config_text() {
fi fi
echo "---------- END -------------" echo "---------- END -------------"
echo echo
echo "V2Ray 客户端使用教程: https://v2ray6.com/post/4/" echo "V2Ray 客户端使用教程: https://233v2.com/post/4/"
echo echo
} }
get_v2ray_config_info_link() { get_v2ray_config_info_link() {
@ -2220,14 +2220,14 @@ get_v2ray_config_info_link() {
echo echo
create_v2ray_config_text >/tmp/233blog_v2ray.txt create_v2ray_config_text >/tmp/233blog_v2ray.txt
local random=$(echo $RANDOM-$RANDOM-$RANDOM | base64 -w 0) local random=$(echo $RANDOM-$RANDOM-$RANDOM | base64 -w 0)
local link=$(curl -s --upload-file /tmp/233blog_v2ray.txt "https://transfer.sh/${random}_v2ray6_v2ray.txt") local link=$(curl -s --upload-file /tmp/233blog_v2ray.txt "https://transfer.sh/${random}_233v2_v2ray.txt")
if [[ $link ]]; then if [[ $link ]]; then
echo echo
echo "---------- V2Ray 配置信息链接-------------" echo "---------- V2Ray 配置信息链接-------------"
echo echo
echo -e "$yellow 链接 = $cyan$link$none" echo -e "$yellow 链接 = $cyan$link$none"
echo echo
echo -e " V2Ray 客户端使用教程: https://v2ray6.com/post/4/" echo -e " V2Ray 客户端使用教程: https://233v2.com/post/4/"
echo echo
echo "备注...链接将在 14 天后失效..." echo "备注...链接将在 14 天后失效..."
echo echo
@ -2293,33 +2293,14 @@ other() {
install_bbr() { install_bbr() {
local test1=$(sed -n '/net.ipv4.tcp_congestion_control/p' /etc/sysctl.conf) local test1=$(sed -n '/net.ipv4.tcp_congestion_control/p' /etc/sysctl.conf)
local test2=$(sed -n '/net.core.default_qdisc/p' /etc/sysctl.conf) local test2=$(sed -n '/net.core.default_qdisc/p' /etc/sysctl.conf)
if [[ $(uname -r | cut -b 1) -eq 4 ]]; then if [[ $test1 == "net.ipv4.tcp_congestion_control = bbr" && $test2 == "net.core.default_qdisc = fq" ]]; then
case $(uname -r | cut -b 3-4) in
9. | [1-9][0-9])
if [[ $test1 == "net.ipv4.tcp_congestion_control = bbr" && $test2 == "net.core.default_qdisc = fq" ]]; then
local is_bbr=true
else
local try_enable_bbr=true
fi
;;
esac
fi
if [[ $is_bbr ]]; then
echo echo
echo -e "$green BBR 已经启用啦...无需再安装$none" echo -e "$green BBR 已经启用啦...无需再安装$none"
echo echo
elif [[ $try_enable_bbr ]]; then
sed -i '/net.ipv4.tcp_congestion_control/d' /etc/sysctl.conf
sed -i '/net.core.default_qdisc/d' /etc/sysctl.conf
echo "net.ipv4.tcp_congestion_control = bbr" >>/etc/sysctl.conf
echo "net.core.default_qdisc = fq" >>/etc/sysctl.conf
sysctl -p >/dev/null 2>&1
echo
echo -e "$green ..由于你的 VPS 内核支持开启 BBR ...已经为你启用 BBR 优化....$none"
echo
else else
# https://teddysun.com/489.html _load bbr.sh
bash <(curl -s -L https://github.com/teddysun/across/raw/master/bbr.sh) _try_enable_bbr
[[ ! $enable_bbr ]] && bash <(curl -s -L https://github.com/teddysun/across/raw/master/bbr.sh)
fi fi
} }
install_lotserver() { install_lotserver() {
@ -2623,7 +2604,7 @@ do_service() {
} }
_help() { _help() {
echo echo
echo "........... V2Ray 管理脚本帮助信息 by v2ray6.com .........." echo "........... V2Ray 管理脚本帮助信息 by 233v2.com .........."
echo -e " echo -e "
${green}v2ray menu $none管理 V2Ray (同等于直接输入 v2ray) ${green}v2ray menu $none管理 V2Ray (同等于直接输入 v2ray)
@ -2664,17 +2645,17 @@ menu() {
clear clear
while :; do while :; do
echo echo
echo "........... V2Ray 管理脚本 $_version by v2ray6.com .........." echo "........... V2Ray 管理脚本 $_version by 233v2.com .........."
echo echo
echo -e "## V2Ray 版本: $cyan$v2ray_ver$none / V2Ray 状态: $v2ray_status ##" echo -e "## V2Ray 版本: $cyan$v2ray_ver$none / V2Ray 状态: $v2ray_status ##"
echo echo
echo "帮助说明: https://v2ray6.com/post/1/" echo "帮助说明: https://233v2.com/post/1/"
echo echo
echo "反馈问题: https://github.com/233boy/v2ray/issues" echo "反馈问题: https://github.com/233boy/v2ray/issues"
echo echo
echo "TG 群组: https://t.me/blog233" echo "TG 群组: https://t.me/blog233"
echo echo
echo "捐赠脚本作者: https://v2ray6.com/donate/" echo "捐赠脚本作者: https://233v2.com/donate/"
echo echo
echo "捐助 V2Ray: https://www.v2ray.com/chapter_00/02_donate.html" echo "捐助 V2Ray: https://www.v2ray.com/chapter_00/02_donate.html"
echo echo

Loading…
Cancel
Save