Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config_init/nginx/lb_http_server.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion scripts/gists/service.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down