stanley-king 2 rokov pred
rodič
commit
5218bccea5

+ 2 - 6
docker/compose/homecuda/admin_vendor/docker-compose.yml

@@ -4,14 +4,10 @@ services:
   nginx:
     image: nginx:alpine
     ports:
-      - "8000:80"
+      - "8080:80"
     volumes:
-      - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/nginx/nginx_admin.conf:/etc/nginx/nginx.conf:ro
-      - ./redmine/:/var/www/html/redmine
-      - /nfs/ylupload:/var/www/html/data/upload
-      - /nfs/ylmerchant:/var/www/html/merchant
+      - ../conf/nginx/nginx_vendor.conf:/etc/nginx/nginx.conf:ro
     container_name: "yl-nginx"
     command: [nginx,'-g','daemon off;']
     extra_hosts:

+ 19 - 0
docker/compose/workcuda/admin_vendor/docker-compose.yml

@@ -0,0 +1,19 @@
+version: "3.7"
+
+services:
+  nginx:
+    image: nginx:alpine
+    ports:
+      - "80:80"
+    volumes:
+      - ./redmine:/var/www/html/redmine
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/nginx/nginx_vendor.conf:/etc/nginx/nginx.conf:ro
+    container_name: "yl-nginx"
+    command: [nginx,'-g','daemon off;']
+    extra_hosts:
+      - "docker.hostip:172.17.0.1"
+    deploy:
+      resources:
+        limits:
+          cpus: '8'

+ 67 - 0
docker/compose/workcuda/conf/nginx/nginx_vendor.conf

@@ -0,0 +1,67 @@
+user nginx;
+worker_processes  16;
+error_log   /var/error.log  info;
+worker_rlimit_nofile 10240;
+
+events {
+    worker_connections  8192;
+    multi_accept on;
+    use epoll;
+}
+
+http 
+{
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    underscores_in_headers on;
+    client_max_body_size 32M;
+    client_body_buffer_size 1024K;
+
+    tcp_nopush on;
+
+    sendfile            on;
+    keepalive_timeout   300;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    upstream redmine {
+        server docker.hostip:3600;
+    }
+
+    server
+    {
+    	listen       80;
+        set  $folder_name /var/www/html;
+        server_name 192.168.3.226;
+        root $folder_name;
+        index index.html index.php; 
+
+    	proxy_connect_timeout 500s;
+        proxy_read_timeout 500s;
+        proxy_send_timeout 500s;
+
+        fastcgi_connect_timeout 75;
+        fastcgi_read_timeout 600;   
+        fastcgi_send_timeout 600;
+        fastcgi_buffer_size  32K;
+        fastcgi_buffers      32 32K;
+
+        set_real_ip_from 100.64.0.0/10;
+        real_ip_header X-Forwarded-For;
+
+        charset utf-8;
+
+        location / {
+            proxy_pass         http://redmine;
+            proxy_redirect     off;
+
+            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;
+        }
+    }
+}