From b7a3aca3641d4df2cda38841b31c76d97a71c67d Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 5 Jun 2025 20:05:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B0=86nginx=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=86=E5=BC=80=E4=B8=BAHTTP=E5=92=8CHTTPS?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E8=B4=9F=E8=BD=BD=E5=9D=87=E8=A1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linux/usr/local/etc/omc/nginx/omc-http.conf | 49 ++++++++++++++++ .../omc/nginx/{omc.conf => omc-https.conf} | 57 +++---------------- linux/usr/local/etc/omc/nginx/omc-lb.conf | 33 +++++++++++ 3 files changed, 91 insertions(+), 48 deletions(-) create mode 100644 linux/usr/local/etc/omc/nginx/omc-http.conf rename linux/usr/local/etc/omc/nginx/{omc.conf => omc-https.conf} (56%) create mode 100644 linux/usr/local/etc/omc/nginx/omc-lb.conf diff --git a/linux/usr/local/etc/omc/nginx/omc-http.conf b/linux/usr/local/etc/omc/nginx/omc-http.conf new file mode 100644 index 0000000..6ce2211 --- /dev/null +++ b/linux/usr/local/etc/omc/nginx/omc-http.conf @@ -0,0 +1,49 @@ +upstream lbHTTPByOMC { + server 127.0.0.1:33030 max_fails=3 fail_timeout=30s; + #server 127.0.0.2:33030 max_fails=3 fail_timeout=30s; +} + +server { + listen 80; + listen [::]:80; + server_name www.omc.local; + + client_max_body_size 100M; + keepalive_timeout 180s; + + # access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/local/etc/omc/web; + + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + location /omc-api/ { + proxy_cache_bypass $http_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Port $server_port; + + proxy_connect_timeout 180s; + proxy_send_timeout 180s; + proxy_read_timeout 180s; + + proxy_pass http://lbHTTPByOMC; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + return 301 http://$host$request_uri; + } +} diff --git a/linux/usr/local/etc/omc/nginx/omc.conf b/linux/usr/local/etc/omc/nginx/omc-https.conf similarity index 56% rename from linux/usr/local/etc/omc/nginx/omc.conf rename to linux/usr/local/etc/omc/nginx/omc-https.conf index ff88383..df60525 100644 --- a/linux/usr/local/etc/omc/nginx/omc.conf +++ b/linux/usr/local/etc/omc/nginx/omc-https.conf @@ -1,56 +1,12 @@ -server { - listen 80; - listen [::]:80; - server_name www.omc.org; - - client_max_body_size 100M; - keepalive_timeout 180s; - - # access_log /var/log/nginx/host.access.log main; - - location / { - root /usr/local/etc/omc/web; - - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - - location /omc-api/ { - proxy_pass http://127.0.0.1:33030/; - - proxy_connect_timeout 180s; - proxy_send_timeout 180s; - proxy_read_timeout 180s; - - proxy_cache_bypass $http_upgrade; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Port $server_port; - } - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - +upstream lbHTTPSByOMC { + server 127.0.0.1:33443 max_fails=3 fail_timeout=30s; + #server 127.0.0.2:33443 max_fails=3 fail_timeout=30s; } server { listen 443 ssl http2; listen [::]:443 ssl http2; server_name www.omc.net; - - client_max_body_size 100M; - keepalive_timeout 180s; ssl_certificate /usr/local/etc/omc/certs/www.omc.net.crt; ssl_certificate_key /usr/local/etc/omc/certs/www.omc.net.key; @@ -60,7 +16,12 @@ server { ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5; ssl_prefer_server_ciphers on; #ssl_dhparam /usr/share/nginx/cert/dhparams.pem; + + client_max_body_size 100M; + keepalive_timeout 180s; + # access_log /var/log/nginx/host.access.log main; + location / { root /usr/local/etc/omc/web; @@ -83,7 +44,7 @@ server { proxy_send_timeout 180s; proxy_read_timeout 180s; - proxy_pass https://127.0.0.1:33443/; + proxy_pass https://lbHTTPSByOMC; } #error_page 404 /404.html; diff --git a/linux/usr/local/etc/omc/nginx/omc-lb.conf b/linux/usr/local/etc/omc/nginx/omc-lb.conf new file mode 100644 index 0000000..60cde90 --- /dev/null +++ b/linux/usr/local/etc/omc/nginx/omc-lb.conf @@ -0,0 +1,33 @@ +upstream lbByOMC { + server 127.0.0.1:33030 max_fails=3 fail_timeout=30s; + #server 127.0.0.2:33030 max_fails=3 fail_timeout=30s; +} + +server { + listen 33040; + listen [::]:33040; + server_name omc; + + client_max_body_size 100M; + keepalive_timeout 180s; + + # access_log /var/log/nginx/host.access.log main; + + location / { + proxy_cache_bypass $http_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Port $server_port; + + proxy_connect_timeout 180s; + proxy_send_timeout 180s; + proxy_read_timeout 180s; + + proxy_pass https://lbByOMC; + } +}