'commit'

dsBaseWeb/default.conf

@@ -1,21 +1,21 @@
-server {            
+server {            
-    listen       80;       
+    listen       80;       
-    listen  [::]:80;       
+    listen  [::]:80;       
-    server_name  localhost;                           
+    server_name  localhost;                           
-                                                      
+                                                      
-    #access_log  /var/log/nginx/host.access.log  main;
+    #access_log  /var/log/nginx/host.access.log  main;
-
+
-    location / {                     
+    location / {                     
-        root   /usr/share/nginx/html;
+        root   /usr/share/nginx/html;
-        index  index.html index.htm;
+        index  index.html index.htm;
-    }
+    }
-    
+    
-    location /dsBase {                     
+    location /dsBase {                     
-        proxy_pass http://dsBaseService/dsBase;
+        proxy_pass http://dsBaseService/dsBase;
-    }                                       
+    }                                       
-                                         
+                                         
-    error_page   500 502 503 504  /50x.html;
+    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {           
+    location = /50x.html {           
-        root   /usr/share/nginx/html;
+        root   /usr/share/nginx/html;
-    }
+    }
-}
+}

dsBaseWeb/nginx.conf

@@ -1,35 +1,35 @@
-user  nginx;
+user  nginx;
-worker_processes  auto;
+worker_processes  auto;
-
+
-error_log  /var/log/nginx/error.log notice;
+error_log  /var/log/nginx/error.log notice;
-pid        /var/run/nginx.pid;
+pid        /var/run/nginx.pid;
-
+
-
+
-events {
+events {
-    worker_connections  1024;
+    worker_connections  1024;
-}
+}
-
+
-
+
-http {
+http {
-    include       /etc/nginx/mime.types;
+    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
+    default_type  application/octet-stream;
-
+
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
+                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
+                      '"$http_user_agent" "$http_x_forwarded_for"';
-
+
-    access_log  /var/log/nginx/access.log  main;
+    access_log  /var/log/nginx/access.log  main;
-
+
-    sendfile        on;
+    sendfile        on;
-    #tcp_nopush     on;
+    #tcp_nopush     on;
-
+
-    keepalive_timeout  65;
+    keepalive_timeout  65;
-
+
-    #gzip  on;
+    #gzip  on;
-	
+	
-    upstream dsBaseService {
+    upstream dsBaseService {
-	server ds-base:8001;
+	server ds-base:8001;
-    }
+    }
-
+
-    include /etc/nginx/conf.d/*.conf;
+    include /etc/nginx/conf.d/*.conf;
-}
+}