diff --git a/build/etc/nginx/conf.d/omc.conf b/build/etc/nginx/conf.d/omc.conf index f55258a..0e1facc 100644 --- a/build/etc/nginx/conf.d/omc.conf +++ b/build/etc/nginx/conf.d/omc.conf @@ -1,85 +1,23 @@ -server { - listen 44443 ssl; - listen [::]:44443 ssl; - server_name 0.0.0.0; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; - # SSL - ssl_certificate /usr/local/omc/etc/certs/omc-server.crt; - ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key; - - # CA, 自定义 - ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt; - ssl_verify_client on; - - # ssl ciphers - ssl_protocols TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - - # OMC - location / { - root /usr/local/omc/htdocs/front; - - 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; # 默认60s - proxy_send_timeout 180s; # 默认60s - proxy_read_timeout 180s; # 默认60s - - 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; - } - - location /api/rest/ { - # 添加斜杠并重定向 - #rewrite ^([^.]*[^/])$ $1/ permanent; - proxy_pass http://127.0.0.1:33030/api/rest/; - - 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; - } -} - server { listen 44080; + listen 44443; listen [::]:44080; + listen [::]:44443; server_name localhost; - # 修改允许最大请求体大小为100MB client_max_body_size 100M; - # 持久连接的超时时间默认60s keepalive_timeout 180s; #access_log /var/log/nginx/host.access.log main; - # ssl_certificate /usr/share/nginx/cert/www.x.cn_chain.crt; - # ssl_certificate_key /usr/share/nginx/cert/www.x.cn.key; - + # ssl_certificate /usr/local/omc/etc/certs/omc-server.crt; + # ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key; + # ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt; + # ssl_verify_client on; # ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; # ssl_session_timeout 5m; # 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; # OMC location / { @@ -92,9 +30,9 @@ server { location /omc-api/ { proxy_pass http://127.0.0.1:33030/; - proxy_connect_timeout 180s; # 默认60s - proxy_send_timeout 180s; # 默认60s - proxy_read_timeout 180s; # 默认60s + proxy_connect_timeout 180s; + proxy_send_timeout 180s; + proxy_read_timeout 180s; proxy_cache_bypass $http_upgrade; proxy_set_header Upgrade $http_upgrade; @@ -108,8 +46,6 @@ server { } location /api/rest/ { - # 添加斜杠并重定向 - #rewrite ^([^.]*[^/])$ $1/ permanent; proxy_pass http://127.0.0.1:33030/api/rest/; proxy_cache_bypass $http_upgrade; diff --git a/debbuild/22.04/etc/nginx/conf.d/omc.conf b/debbuild/22.04/etc/nginx/conf.d/omc.conf index f55258a..0e1facc 100644 --- a/debbuild/22.04/etc/nginx/conf.d/omc.conf +++ b/debbuild/22.04/etc/nginx/conf.d/omc.conf @@ -1,85 +1,23 @@ -server { - listen 44443 ssl; - listen [::]:44443 ssl; - server_name 0.0.0.0; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; - # SSL - ssl_certificate /usr/local/omc/etc/certs/omc-server.crt; - ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key; - - # CA, 自定义 - ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt; - ssl_verify_client on; - - # ssl ciphers - ssl_protocols TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - - # OMC - location / { - root /usr/local/omc/htdocs/front; - - 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; # 默认60s - proxy_send_timeout 180s; # 默认60s - proxy_read_timeout 180s; # 默认60s - - 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; - } - - location /api/rest/ { - # 添加斜杠并重定向 - #rewrite ^([^.]*[^/])$ $1/ permanent; - proxy_pass http://127.0.0.1:33030/api/rest/; - - 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; - } -} - server { listen 44080; + listen 44443; listen [::]:44080; + listen [::]:44443; server_name localhost; - # 修改允许最大请求体大小为100MB client_max_body_size 100M; - # 持久连接的超时时间默认60s keepalive_timeout 180s; #access_log /var/log/nginx/host.access.log main; - # ssl_certificate /usr/share/nginx/cert/www.x.cn_chain.crt; - # ssl_certificate_key /usr/share/nginx/cert/www.x.cn.key; - + # ssl_certificate /usr/local/omc/etc/certs/omc-server.crt; + # ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key; + # ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt; + # ssl_verify_client on; # ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; # ssl_session_timeout 5m; # 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; # OMC location / { @@ -92,9 +30,9 @@ server { location /omc-api/ { proxy_pass http://127.0.0.1:33030/; - proxy_connect_timeout 180s; # 默认60s - proxy_send_timeout 180s; # 默认60s - proxy_read_timeout 180s; # 默认60s + proxy_connect_timeout 180s; + proxy_send_timeout 180s; + proxy_read_timeout 180s; proxy_cache_bypass $http_upgrade; proxy_set_header Upgrade $http_upgrade; @@ -108,8 +46,6 @@ server { } location /api/rest/ { - # 添加斜杠并重定向 - #rewrite ^([^.]*[^/])$ $1/ permanent; proxy_pass http://127.0.0.1:33030/api/rest/; proxy_cache_bypass $http_upgrade; diff --git a/debbuild/etc/nginx/conf.d/omc.conf b/debbuild/etc/nginx/conf.d/omc.conf index f55258a..0e1facc 100644 --- a/debbuild/etc/nginx/conf.d/omc.conf +++ b/debbuild/etc/nginx/conf.d/omc.conf @@ -1,85 +1,23 @@ -server { - listen 44443 ssl; - listen [::]:44443 ssl; - server_name 0.0.0.0; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; - # SSL - ssl_certificate /usr/local/omc/etc/certs/omc-server.crt; - ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key; - - # CA, 自定义 - ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt; - ssl_verify_client on; - - # ssl ciphers - ssl_protocols TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - - # OMC - location / { - root /usr/local/omc/htdocs/front; - - 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; # 默认60s - proxy_send_timeout 180s; # 默认60s - proxy_read_timeout 180s; # 默认60s - - 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; - } - - location /api/rest/ { - # 添加斜杠并重定向 - #rewrite ^([^.]*[^/])$ $1/ permanent; - proxy_pass http://127.0.0.1:33030/api/rest/; - - 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; - } -} - server { listen 44080; + listen 44443; listen [::]:44080; + listen [::]:44443; server_name localhost; - # 修改允许最大请求体大小为100MB client_max_body_size 100M; - # 持久连接的超时时间默认60s keepalive_timeout 180s; #access_log /var/log/nginx/host.access.log main; - # ssl_certificate /usr/share/nginx/cert/www.x.cn_chain.crt; - # ssl_certificate_key /usr/share/nginx/cert/www.x.cn.key; - + # ssl_certificate /usr/local/omc/etc/certs/omc-server.crt; + # ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key; + # ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt; + # ssl_verify_client on; # ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; # ssl_session_timeout 5m; # 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; # OMC location / { @@ -92,9 +30,9 @@ server { location /omc-api/ { proxy_pass http://127.0.0.1:33030/; - proxy_connect_timeout 180s; # 默认60s - proxy_send_timeout 180s; # 默认60s - proxy_read_timeout 180s; # 默认60s + proxy_connect_timeout 180s; + proxy_send_timeout 180s; + proxy_read_timeout 180s; proxy_cache_bypass $http_upgrade; proxy_set_header Upgrade $http_upgrade; @@ -108,8 +46,6 @@ server { } location /api/rest/ { - # 添加斜杠并重定向 - #rewrite ^([^.]*[^/])$ $1/ permanent; proxy_pass http://127.0.0.1:33030/api/rest/; proxy_cache_bypass $http_upgrade; diff --git a/rpmbuild/BUILD/etc/nginx/conf.d/omc.conf b/rpmbuild/BUILD/etc/nginx/conf.d/omc.conf index f55258a..0e1facc 100644 --- a/rpmbuild/BUILD/etc/nginx/conf.d/omc.conf +++ b/rpmbuild/BUILD/etc/nginx/conf.d/omc.conf @@ -1,85 +1,23 @@ -server { - listen 44443 ssl; - listen [::]:44443 ssl; - server_name 0.0.0.0; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; - # SSL - ssl_certificate /usr/local/omc/etc/certs/omc-server.crt; - ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key; - - # CA, 自定义 - ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt; - ssl_verify_client on; - - # ssl ciphers - ssl_protocols TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - - # OMC - location / { - root /usr/local/omc/htdocs/front; - - 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; # 默认60s - proxy_send_timeout 180s; # 默认60s - proxy_read_timeout 180s; # 默认60s - - 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; - } - - location /api/rest/ { - # 添加斜杠并重定向 - #rewrite ^([^.]*[^/])$ $1/ permanent; - proxy_pass http://127.0.0.1:33030/api/rest/; - - 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; - } -} - server { listen 44080; + listen 44443; listen [::]:44080; + listen [::]:44443; server_name localhost; - # 修改允许最大请求体大小为100MB client_max_body_size 100M; - # 持久连接的超时时间默认60s keepalive_timeout 180s; #access_log /var/log/nginx/host.access.log main; - # ssl_certificate /usr/share/nginx/cert/www.x.cn_chain.crt; - # ssl_certificate_key /usr/share/nginx/cert/www.x.cn.key; - + # ssl_certificate /usr/local/omc/etc/certs/omc-server.crt; + # ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key; + # ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt; + # ssl_verify_client on; # ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; # ssl_session_timeout 5m; # 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; # OMC location / { @@ -92,9 +30,9 @@ server { location /omc-api/ { proxy_pass http://127.0.0.1:33030/; - proxy_connect_timeout 180s; # 默认60s - proxy_send_timeout 180s; # 默认60s - proxy_read_timeout 180s; # 默认60s + proxy_connect_timeout 180s; + proxy_send_timeout 180s; + proxy_read_timeout 180s; proxy_cache_bypass $http_upgrade; proxy_set_header Upgrade $http_upgrade; @@ -108,8 +46,6 @@ server { } location /api/rest/ { - # 添加斜杠并重定向 - #rewrite ^([^.]*[^/])$ $1/ permanent; proxy_pass http://127.0.0.1:33030/api/rest/; proxy_cache_bypass $http_upgrade;