From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
script/docker/nginx/nginx.conf | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/docker/nginx/nginx.conf b/script/docker/nginx/nginx.conf
similarity index 84%
rename from docker/nginx/nginx.conf
rename to script/docker/nginx/nginx.conf
index a511f35..93a633e 100644
--- a/docker/nginx/nginx.conf
+++ b/script/docker/nginx/nginx.conf
@@ -31,6 +31,10 @@
server 172.30.0.90:9090;
}
+ upstream xxl-job-admin {
+ server 172.30.0.92:9100;
+ }
+
server {
listen 80;
server_name localhost;
@@ -70,6 +74,14 @@
proxy_pass http://monitor-admin/admin/;
}
+ location /xxl-job-admin/ {
+ proxy_set_header Host $http_host;
+ 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://xxl-job-admin/xxl-job-admin/;
+ }
+
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
--
Gitblit v1.9.3