diff --git a/dsBaseWeb/default.conf b/dsBaseWeb/default.conf index 5726db39..f36fb1fa 100644 --- a/dsBaseWeb/default.conf +++ b/dsBaseWeb/default.conf @@ -1,21 +1,21 @@ -server { - listen 80; - listen [::]:80; - server_name localhost; - - #access_log /var/log/nginx/host.access.log main; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - } - - location /dsBase { - proxy_pass http://dsBaseService/dsBase; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } -} +server { + listen 80; + listen [::]:80; + server_name localhost; + + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + location /dsBase { + proxy_pass http://dsBaseService/dsBase; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} diff --git a/dsBaseWeb/nginx.conf b/dsBaseWeb/nginx.conf index 3b0c59d4..b3bf9f80 100644 --- a/dsBaseWeb/nginx.conf +++ b/dsBaseWeb/nginx.conf @@ -1,35 +1,35 @@ -user nginx; -worker_processes auto; - -error_log /var/log/nginx/error.log notice; -pid /var/run/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - keepalive_timeout 65; - - #gzip on; - - upstream dsBaseService { - server ds-base:8001; - } - - include /etc/nginx/conf.d/*.conf; -} +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + upstream dsBaseService { + server ds-base:8001; + } + + include /etc/nginx/conf.d/*.conf; +}