Merge branch 'main' into multi-tenant

build/etc/nginx/conf.d/omc.conf

@@ -1,57 +1,40 @@
 server {
-    listen          4443 ssl;
-    listen          [::]:4443 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;
+    listen       44080;
+    listen       44443;
+    listen  [::]:44080;
+    listen  [::]:44443;
+    server_name  localhost;
     
-    # 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;
+    client_max_body_size 100M;
+    keepalive_timeout    180s;
 
-#    location /api/rest/securityManagement {
-#        proxy_pass                         http://127.0.0.1:5050;
-#    }
-#    location /api/rest/resourceManagement {
-#        proxy_pass                         http://127.0.0.1:5050;
-#    }
-#    location /api/rest/performanceManagement {
-#        proxy_pass                         http://127.0.0.1:5050;
-#    }
-#    location /api/rest/faultManagement {
-#        proxy_pass                         http://127.0.0.1:5050;
-#    }
-#    location /api/rest/aaaa/ {
-#        proxy_pass                         http://127.0.0.1:4040;
-#    }
-    location /api/rest/ {
-        proxy_pass                         http://127.0.0.1:3030;
-    }                      
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    # 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;
+
+    # OMC
     location / {
-            try_files $uri $uri/ =404;
+        root /usr/local/omc/htdocs/front;
+
+        try_files $uri $uri/ /index.html;
+        index  index.html index.htm;
     }
-}
 
-server {
-    listen 8888 default_server;
-    listen [::]:8888 default_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_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;
@@ -62,11 +45,27 @@ server {
         proxy_set_header X-Forwarded-Port   $server_port;
     }
 
-    location / {
-        root /usr/local/omc/htdocs/front;
+    location /api/rest/ {
+        proxy_pass http://127.0.0.1:33030/api/rest/;
 
-        try_files $uri $uri/ /index.html;
-        index   index.html index.htm;
+        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;
     }
 }