From 558c2dc5b2b5f78a7f5fc0595dbac03416c0513d Mon Sep 17 00:00:00 2001 From: wulabing Date: Wed, 6 Dec 2017 16:18:42 +0800 Subject: [PATCH] V2.1 --- install.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 673c840..4ec2cb7 100644 --- a/install.sh +++ b/install.sh @@ -4,7 +4,7 @@ # System Request:Debian 7+/Ubuntu 14.04+/Centos 6+ # Author: wulabing # Dscription: V2ray ws+tls onekey -# Version: 1.0 +# Version: 2.1 # Blog: https://www.wulabing.com # Official document: www.v2ray.com #==================================================== @@ -34,9 +34,11 @@ check_system(){ if [[ "${ID}" == "centos" && ${VERSION_ID} -ge 7 ]];then echo -e "${OK} ${GreenBG} 当前系统为 Centos ${VERSION_ID} ${Font} " INS="yum" - echo -e "${OK} ${GreenBG} SElinux 设置中 ${Font} " + echo -e "${OK} ${GreenBG} SElinux 设置中,请耐心等待,不要进行其他操作${Font} " setsebool -P httpd_can_network_connect 1 echo -e "${OK} ${GreenBG} SElinux 设置完成 ${Font} " + rpm -ivh http://nginx.org/packages/centos/7/noarch/RPMS/nginx-release-centos-7-0.el7.ngx.noarch.rpm + echo -e "${OK} ${GreenBG} Nginx rpm源 安装完成 ${Font}" elif [[ "${ID}" == "debian" && ${VERSION_ID} -ge 8 ]];then echo -e "${OK} ${GreenBG} 当前系统为 Debian ${VERSION_ID} ${Font} " INS="apt-get" @@ -236,7 +238,7 @@ port_exist_check(){ fi } acme(){ - ~/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 + ~/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 --force if [[ $? -eq 0 ]];then echo -e "${OK} ${GreenBG} SSL 证书生成成功 ${Font}" sleep 2 @@ -362,8 +364,8 @@ show_information(){ } main(){ - check_system is_root + check_system time_modify dependency_install domain_check