diff --git a/build/etc/conf.d/nginx/omc.conf b/build/etc/conf.d/nginx/omc.conf index cb4221b..0731143 100644 --- a/build/etc/conf.d/nginx/omc.conf +++ b/build/etc/conf.d/nginx/omc.conf @@ -24,22 +24,23 @@ server { # proxy_pass http://127.0.0.1:5050; # } # location /api/rest/aaaa/ { -# proxy_pass http://127.0.0.1:4040; +# proxy_pass http://127.0.0.1:4040; # } location /api/rest/ { - proxy_pass http://127.0.0.1:3030; - } + proxy_pass http://127.0.0.1:3030; + } location / { try_files $uri $uri/ =404; } } server { - listen 8888 default_server; - listen [::]:8888 default_server; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; + 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/; @@ -55,11 +56,11 @@ server { proxy_set_header X-Forwarded-Port $server_port; } - location / { + location / { root /usr/local/omc/htdocs/front; try_files $uri $uri/ /index.html; index index.html index.htm; - } + } } diff --git a/debbuild/22.04/etc/nginx/conf.d/omc.conf b/debbuild/22.04/etc/nginx/conf.d/omc.conf index cb4221b..0731143 100644 --- a/debbuild/22.04/etc/nginx/conf.d/omc.conf +++ b/debbuild/22.04/etc/nginx/conf.d/omc.conf @@ -24,22 +24,23 @@ server { # proxy_pass http://127.0.0.1:5050; # } # location /api/rest/aaaa/ { -# proxy_pass http://127.0.0.1:4040; +# proxy_pass http://127.0.0.1:4040; # } location /api/rest/ { - proxy_pass http://127.0.0.1:3030; - } + proxy_pass http://127.0.0.1:3030; + } location / { try_files $uri $uri/ =404; } } server { - listen 8888 default_server; - listen [::]:8888 default_server; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; + 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/; @@ -55,11 +56,11 @@ server { proxy_set_header X-Forwarded-Port $server_port; } - location / { + location / { 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 cb4221b..0731143 100644 --- a/debbuild/etc/nginx/conf.d/omc.conf +++ b/debbuild/etc/nginx/conf.d/omc.conf @@ -24,22 +24,23 @@ server { # proxy_pass http://127.0.0.1:5050; # } # location /api/rest/aaaa/ { -# proxy_pass http://127.0.0.1:4040; +# proxy_pass http://127.0.0.1:4040; # } location /api/rest/ { - proxy_pass http://127.0.0.1:3030; - } + proxy_pass http://127.0.0.1:3030; + } location / { try_files $uri $uri/ =404; } } server { - listen 8888 default_server; - listen [::]:8888 default_server; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; + 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/; @@ -55,11 +56,11 @@ server { proxy_set_header X-Forwarded-Port $server_port; } - location / { + location / { 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 cb4221b..0731143 100644 --- a/rpmbuild/BUILD/etc/nginx/conf.d/omc.conf +++ b/rpmbuild/BUILD/etc/nginx/conf.d/omc.conf @@ -24,22 +24,23 @@ server { # proxy_pass http://127.0.0.1:5050; # } # location /api/rest/aaaa/ { -# proxy_pass http://127.0.0.1:4040; +# proxy_pass http://127.0.0.1:4040; # } location /api/rest/ { - proxy_pass http://127.0.0.1:3030; - } + proxy_pass http://127.0.0.1:3030; + } location / { try_files $uri $uri/ =404; } } server { - listen 8888 default_server; - listen [::]:8888 default_server; - root /usr/local/omc/htdocs/front/; - index index.html index.htm; - server_name localhost; + 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/; @@ -55,11 +56,11 @@ server { proxy_set_header X-Forwarded-Port $server_port; } - location / { + location / { root /usr/local/omc/htdocs/front; try_files $uri $uri/ /index.html; index index.html index.htm; - } + } }