diff --git a/config_init/nginx/lb_http_server.conf b/config_init/nginx/lb_http_server.conf index ef12af4..b6318b3 100644 --- a/config_init/nginx/lb_http_server.conf +++ b/config_init/nginx/lb_http_server.conf @@ -8,7 +8,7 @@ server { listen 80; # listen [::]:80; # server_name demo.jumpserver.org; # 取消注释并自行修改成你自己的域名 - return 307 https://$server_name$request_uri; + return 307 https://$host$request_uri; } server { diff --git a/scripts/gists/service.sh b/scripts/gists/service.sh index 91083ad..5aef6c9 100644 --- a/scripts/gists/service.sh +++ b/scripts/gists/service.sh @@ -173,7 +173,7 @@ function get_docker_compose_cmd_line() { fi fi - if [[ "${use_lb}" == "1" ]]; then + if [[ "${use_lb}" == "1" && -n "${https_port}" ]]; then cmd+=" -f compose/web.https.yml" fi