From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 20 十月 2021 13:07:16 +0800 Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像 --- docker/nginx/nginx.conf | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index cd4013b..a511f35 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -1,5 +1,8 @@ worker_processes 1; +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + events { worker_connections 1024; } @@ -9,15 +12,41 @@ default_type application/octet-stream; sendfile on; keepalive_timeout 65; + # 闄愬埗body澶у皬 + client_max_body_size 100m; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; upstream server { + ip_hash; server 172.30.0.60:8080; server 172.30.0.61:8080; } + upstream monitor-admin { + server 172.30.0.90:9090; + } + server { listen 80; server_name localhost; + + # https閰嶇疆鍙傝�� start + #listen 443 ssl; + + # 璇佷功鐩存帴瀛樻斁 /docker/nginx/cert/ 鐩綍涓嬪嵆鍙� 鏇存敼璇佷功鍚嶇О鍗冲彲 鏃犻渶鏇存敼璇佷功璺緞 + #ssl on; + #ssl_certificate /etc/nginx/cert/xxx.local.crt; # /etc/nginx/cert/ 涓篸ocker鏄犲皠璺緞 涓嶅厑璁告洿鏀� + #ssl_certificate_key /etc/nginx/cert/xxx.local.key; # /etc/nginx/cert/ 涓篸ocker鏄犲皠璺緞 涓嶅厑璁告洿鏀� + #ssl_session_timeout 5m; + #ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; + #ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + #ssl_prefer_server_ciphers on; + # https閰嶇疆鍙傝�� end location / { root /usr/share/nginx/html; @@ -38,7 +67,7 @@ proxy_set_header X-Real-IP $remote_addr; proxy_set_header REMOTE-HOST $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://server/admin/; + proxy_pass http://monitor-admin/admin/; } error_page 500 502 503 504 /50x.html; -- Gitblit v1.9.3