diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index e6da124f..ceb61ba4 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -6,7 +6,8 @@ dir_shell=/ql/shell link_shell echo -e "======================1. 检测配置文件========================\n" fix_config -cp -fv $dir_root/docker/front.conf /etc/nginx/conf.d/front.conf +cp -fv $nginx_conf /etc/nginx/nginx.conf +cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf pm2 l >/dev/null 2>&1 echo diff --git a/shell/check.sh b/shell/check.sh index 8cd4fd90..00194901 100644 --- a/shell/check.sh +++ b/shell/check.sh @@ -3,7 +3,6 @@ dir_shell=/ql/shell . $dir_shell/share.sh . $dir_shell/api.sh -get_token reset_env() { echo -e "---> 1. 开始检测配置文件\n"