From c88c1165c186eaa1873ddb7882adfcfcdebf190c Mon Sep 17 00:00:00 2001 From: P3terChan Date: Fri, 19 May 2017 17:30:49 +0800 Subject: [PATCH] v1.3.2 --- status.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/status.sh b/status.sh index 48e04ce..9d52280 100644 --- a/status.sh +++ b/status.sh @@ -5,12 +5,12 @@ export PATH #================================================= # System Required: CentOS/Debian/Ubuntu # Description: ServerStatus client + server -# Version: 1.3.1 +# Version: 1.3.2 # Author: P3terChan # Blog: https://www.p3ter.me #================================================= -sh_ver="1.3.1" +sh_ver="1.3.2" file="/usr/local/ServerStatus" web_file="/usr/local/ServerStatus/web" server_file="/usr/local/ServerStatus/server" @@ -560,7 +560,7 @@ Install_caddy(){ wget -N --no-check-certificate https://raw.githubusercontent.com/ToyoDAdoubi/doubi/master/caddy_install.sh chmod +x caddy_install.sh bash caddy_install.sh install - [[ ! -e "/usr/local/caddy/caddy" ]] && exit 0 + [[ ! -e "/usr/local/caddy/caddy" ]] && echo -e "${Error} Caddy安装失败,请手动部署,Web网页文件位置:${Web_file}" && exit 0 else echo -e "${Info} 发现Caddy已安装,开始配置..." fi @@ -576,7 +576,7 @@ EOF else echo -e "${Info} 发现 Caddy 配置文件非空,开始追加 ServerStatus-V 网站配置内容到文件最后..." cat >> "/usr/local/caddy/Caddyfile"<<-EOF -${server_s}:${server_port_s} { +http://${server_s}:${server_port_s} { root ${web_file} timeouts none gzip