From 7d2a5cbbc588f69d7afdaf2afe88b18972f3854f Mon Sep 17 00:00:00 2001 From: wulabing Date: Sun, 23 Feb 2020 23:22:52 +0800 Subject: [PATCH] =?UTF-8?q?1.1.3=20=E6=81=A2=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=AD=BE=E5=8F=91=EF=BC=8C=E7=BB=A7=E7=BB=AD=E5=B0=9D=E8=AF=95?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dkey=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/install.sh b/install.sh index 694a946..9ed7ca4 100644 --- a/install.sh +++ b/install.sh @@ -467,18 +467,16 @@ port_exist_check(){ fi } acme(){ -# $HOME/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 --force --test -# if [[ $? -eq 0 ]];then -# echo -e "${OK} ${GreenBG} SSL 证书测试签发成功,开始正式签发 ${Font}" -# rm -rf "$HOME/.acme.sh/${domain}_ecc/${domain}.key" -# rm -rf "$HOME/.acme.sh/${domain}_ecc/${domain}.cer" -# sleep 2 -# else -# echo -e "${Error} ${RedBG} SSL 证书测试签发失败 ${Font}" -# rm -rf "$HOME/.acme.sh/${domain}_ecc/${domain}.key" -# rm -rf "$HOME/.acme.sh/${domain}_ecc/${domain}.cer" -# exit 1 -# fi + $HOME/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 --force --test + if [[ $? -eq 0 ]];then + echo -e "${OK} ${GreenBG} SSL 证书测试签发成功,开始正式签发 ${Font}" + rm -rf "$HOME/.acme.sh/${domain}_ecc" + sleep 2 + else + echo -e "${Error} ${RedBG} SSL 证书测试签发失败 ${Font}" + rm -rf "$HOME/.acme.sh/${domain}_ecc" + exit 1 + fi $HOME/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 --force if [[ $? -eq 0 ]];then @@ -492,7 +490,7 @@ acme(){ fi else echo -e "${Error} ${RedBG} SSL 证书生成失败 ${Font}" - rm -rf "$HOME/.acme.sh/${domain}_ecc/${domain}.key" && rm -rf "$HOME/.acme.sh/${domain}_ecc/${domain}.cer" + rm -rf "$HOME/.acme.sh/${domain}_ecc" exit 1 fi } @@ -807,6 +805,7 @@ uninstall_all(){ systemctl daemon-reload echo -e "${OK} ${GreenBG} 已卸载,SSL证书文件已保留 ${Font}" } + judge_mode(){ if [ -f $v2ray_bin_file ] then