From ea6e19fd97a8ec95d0bab068d7020edf339c3753 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Wed, 25 Oct 2023 19:57:25 +0800 Subject: [PATCH] fix: omc.conf update --- debbuild/22.04/etc/nginx/conf.d/omc.conf | 28 +++++++++++++++++++----- debbuild/etc/nginx/conf.d/omc.conf | 28 +++++++++++++++++++----- rpmbuild/BUILD/etc/nginx/conf.d/omc.conf | 28 +++++++++++++++++++----- 3 files changed, 69 insertions(+), 15 deletions(-) diff --git a/debbuild/22.04/etc/nginx/conf.d/omc.conf b/debbuild/22.04/etc/nginx/conf.d/omc.conf index 18a692d..cb4221b 100644 --- a/debbuild/22.04/etc/nginx/conf.d/omc.conf +++ b/debbuild/22.04/etc/nginx/conf.d/omc.conf @@ -6,10 +6,10 @@ server { index index.html index.htm; server_name localhost; # SSL - #ssl_certificate /usr/local/omc/etc/certs/ca_cert.pem; - #ssl_certificate_key /usr/local/omc/etc/certs/private_key.pem; - ssl_certificate /usr/local/omc/etc/certs/tsa-omc.pem; - ssl_certificate_key /usr/local/omc/etc/certs/tsa-omc_pri.pem; + ssl_certificate /usr/local/omc/etc/certs/ca_cert.pem; + ssl_certificate_key /usr/local/omc/etc/certs/private_key.pem; + #ssl_certificate /usr/local/omc/etc/certs/tsa-omc.pem; + #ssl_certificate_key /usr/local/omc/etc/certs/tsa-omc_pri.pem; # location /api/rest/securityManagement { # proxy_pass http://127.0.0.1:5050; @@ -40,8 +40,26 @@ server { root /usr/local/omc/htdocs/front/; index index.html index.htm; server_name localhost; + location /omc-api/ { + proxy_pass http://127.0.0.1:3030/; + + proxy_http_version 1.1; + 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 / { - try_files $uri $uri/ =404; + root /usr/local/omc/htdocs/front; + + try_files $uri $uri/ /index.html; + index index.html index.htm; } } diff --git a/debbuild/etc/nginx/conf.d/omc.conf b/debbuild/etc/nginx/conf.d/omc.conf index 18a692d..cb4221b 100644 --- a/debbuild/etc/nginx/conf.d/omc.conf +++ b/debbuild/etc/nginx/conf.d/omc.conf @@ -6,10 +6,10 @@ server { index index.html index.htm; server_name localhost; # SSL - #ssl_certificate /usr/local/omc/etc/certs/ca_cert.pem; - #ssl_certificate_key /usr/local/omc/etc/certs/private_key.pem; - ssl_certificate /usr/local/omc/etc/certs/tsa-omc.pem; - ssl_certificate_key /usr/local/omc/etc/certs/tsa-omc_pri.pem; + ssl_certificate /usr/local/omc/etc/certs/ca_cert.pem; + ssl_certificate_key /usr/local/omc/etc/certs/private_key.pem; + #ssl_certificate /usr/local/omc/etc/certs/tsa-omc.pem; + #ssl_certificate_key /usr/local/omc/etc/certs/tsa-omc_pri.pem; # location /api/rest/securityManagement { # proxy_pass http://127.0.0.1:5050; @@ -40,8 +40,26 @@ server { root /usr/local/omc/htdocs/front/; index index.html index.htm; server_name localhost; + location /omc-api/ { + proxy_pass http://127.0.0.1:3030/; + + proxy_http_version 1.1; + 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 / { - try_files $uri $uri/ =404; + root /usr/local/omc/htdocs/front; + + try_files $uri $uri/ /index.html; + index index.html index.htm; } } diff --git a/rpmbuild/BUILD/etc/nginx/conf.d/omc.conf b/rpmbuild/BUILD/etc/nginx/conf.d/omc.conf index 18a692d..cb4221b 100644 --- a/rpmbuild/BUILD/etc/nginx/conf.d/omc.conf +++ b/rpmbuild/BUILD/etc/nginx/conf.d/omc.conf @@ -6,10 +6,10 @@ server { index index.html index.htm; server_name localhost; # SSL - #ssl_certificate /usr/local/omc/etc/certs/ca_cert.pem; - #ssl_certificate_key /usr/local/omc/etc/certs/private_key.pem; - ssl_certificate /usr/local/omc/etc/certs/tsa-omc.pem; - ssl_certificate_key /usr/local/omc/etc/certs/tsa-omc_pri.pem; + ssl_certificate /usr/local/omc/etc/certs/ca_cert.pem; + ssl_certificate_key /usr/local/omc/etc/certs/private_key.pem; + #ssl_certificate /usr/local/omc/etc/certs/tsa-omc.pem; + #ssl_certificate_key /usr/local/omc/etc/certs/tsa-omc_pri.pem; # location /api/rest/securityManagement { # proxy_pass http://127.0.0.1:5050; @@ -40,8 +40,26 @@ server { root /usr/local/omc/htdocs/front/; index index.html index.htm; server_name localhost; + location /omc-api/ { + proxy_pass http://127.0.0.1:3030/; + + proxy_http_version 1.1; + 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 / { - try_files $uri $uri/ =404; + root /usr/local/omc/htdocs/front; + + try_files $uri $uri/ /index.html; + index index.html index.htm; } }