github
/
Xray_onekey
mirror of https://github.com/wulabing/Xray_onekey
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

V3.3 脚本更新 

1.修复 Ubuntu 16.04/17.10 安装后的Nginx启动失败（等待反馈）
2.修复 由于重复执行脚本导致的 Nginx 安装源的重复添加问题
3.修复 由于重复执行脚本导致的 Nginx 配置文件异常，从而导致Nginx 启动失败的问题
4.修复 Nginx Ubuntu源错误添加问题
pull/41/head
wulabing 2018-04-06 18:06:58 +08:00 committed by GitHub
parent e17bbf95b1
commit fe3f99faf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
install.sh
View File

@ -4,7 +4,7 @@
# System Request:Debian 7+/Ubuntu 14.04+/Centos 6+ # System Request:Debian 7+/Ubuntu 14.04+/Centos 6+
# Author: wulabing # Author: wulabing
# Dscription: V2ray ws+tls onekey # Dscription: V2ray ws+tls onekey
# Version: 3.2 # Version: 3.3
# Blog: https://www.wulabing.com # Blog: https://www.wulabing.com
# Official document: www.v2ray.com # Official document: www.v2ray.com
#==================================================== #====================================================
@ -56,18 +56,22 @@ EOF
echo -e "${OK} ${GreenBG} 当前系统为 Debian ${VERSION_ID} ${VERSION} ${Font} " echo -e "${OK} ${GreenBG} 当前系统为 Debian ${VERSION_ID} ${VERSION} ${Font} "
INS="apt" INS="apt"
## 添加 Nginx apt源 ## 添加 Nginx apt源
if [ ! -f nginx_signing.key ];then
echo "deb http://nginx.org/packages/mainline/debian/ ${VERSION} nginx" >> /etc/apt/sources.list echo "deb http://nginx.org/packages/mainline/debian/ ${VERSION} nginx" >> /etc/apt/sources.list
echo "deb-src http://nginx.org/packages/mainline/debian/ ${VERSION} nginx" >> /etc/apt/sources.list echo "deb-src http://nginx.org/packages/mainline/debian/ ${VERSION} nginx" >> /etc/apt/sources.list
wget -nc https://nginx.org/keys/nginx_signing.key wget -nc https://nginx.org/keys/nginx_signing.key
apt-key add nginx_signing.key apt-key add nginx_signing.key
fi
elif [[ "${ID}" == "ubuntu" && `echo "${VERSION_ID}" | cut -d '.' -f1` -ge 16 ]];then elif [[ "${ID}" == "ubuntu" && `echo "${VERSION_ID}" | cut -d '.' -f1` -ge 16 ]];then
echo -e "${OK} ${GreenBG} 当前系统为 Ubuntu ${VERSION_ID} ${VERSION} ${Font} " echo -e "${OK} ${GreenBG} 当前系统为 Ubuntu ${VERSION_ID} ${VERSION_CODENAME} ${Font} "
INS="apt" INS="apt"
## 添加 Nginx apt源 ## 添加 Nginx apt源
echo "deb http://nginx.org/packages/mainline/debian/ ${VERSION} nginx" >> /etc/apt/sources.list if [ ! -f nginx_signing.key ];then
echo "deb-src http://nginx.org/packages/mainline/debian/ ${VERSION} nginx" >> /etc/apt/sources.list echo "deb http://nginx.org/packages/mainline/ubuntu/ ${VERSION_CODENAME} nginx" >> /etc/apt/sources.list
echo "deb-src http://nginx.org/packages/mainline/ubuntu/ ${VERSION_CODENAME} nginx" >> /etc/apt/sources.list
wget -nc https://nginx.org/keys/nginx_signing.key wget -nc https://nginx.org/keys/nginx_signing.key
apt-key add nginx_signing.key apt-key add nginx_signing.key
fi
else else
echo -e "${Error} ${RedBG} 当前系统为 ${ID} ${VERSION_ID} 不在支持的系统列表内，安装中断 ${Font} " echo -e "${Error} ${RedBG} 当前系统为 ${ID} ${VERSION_ID} 不在支持的系统列表内，安装中断 ${Font} "
exit 1 exit 1
@ -154,6 +158,9 @@ modify_port_UUID(){
} }
modify_nginx(){ modify_nginx(){
## sed 部分地方 适应新配置修正 ## sed 部分地方 适应新配置修正
if [[ -f /etc/nginx/nginx.conf.bak ]];then
cp /etc/nginx/nginx.conf.bak /etc/nginx/nginx.conf
fi
sed -i "1,/listen/{s/listen 443 ssl;/listen ${port} ssl;/}" ${v2ray_conf} sed -i "1,/listen/{s/listen 443 ssl;/listen ${port} ssl;/}" ${v2ray_conf}
sed -i "/server_name/c \\\tserver_name ${domain};" ${nginx_conf} sed -i "/server_name/c \\\tserver_name ${domain};" ${nginx_conf}
sed -i "/location/c \\\tlocation \/${camouflage}\/" ${nginx_conf} sed -i "/location/c \\\tlocation \/${camouflage}\/" ${nginx_conf}
@ -194,6 +201,11 @@ nginx_install(){
echo -e "${Error} ${RedBG} nginx 安装失败 ${Font}" echo -e "${Error} ${RedBG} nginx 安装失败 ${Font}"
exit 5 exit 5
fi fi
if [[ ! -f /etc/nginx/nginx.conf.bak ]];then
cp /etc/nginx/nginx.conf /etc/nginx/nginx.conf.bak
echo -e "${OK} ${GreenBG} nginx 初始配置备份完成 ${Font}"
sleep 1
fi
} }
ssl_install(){ ssl_install(){
if [[ "${ID}" == "centos" ]];then if [[ "${ID}" == "centos" ]];then