Browse Source

Merge branch 'feature/nginx-config' of duanxiaoduan/tmr-admin into release/v1.0.2

xuyiping 1 năm trước cách đây
mục cha
commit
2f9424a7db
2 tập tin đã thay đổi với 13 bổ sung4 xóa
  1. 11 0
      .drone.yml
  2. 2 4
      default.conf.template

+ 11 - 0
.drone.yml

@@ -32,6 +32,17 @@ steps:
       repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/tmr-admin
       registry: registry.cn-hangzhou.aliyuncs.com
       tags: [test]
+  - name: ssh commands
+    image: appleboy/drone-ssh
+    settings:
+      host: 192.168.1.70
+      username: tmrwatch
+      password:
+        from_secret: ssh_password
+      port: 22
+      script:
+        - cd /data/docker-compose/calf-feed-admin/
+        - echo "123456" | ./restart.sh
 trigger:
   branch:
     include:

+ 2 - 4
default.conf.template

@@ -3,8 +3,6 @@ server {
    listen  [::]:80;
    server_name  localhost;
 
-   access_log  /var/log/nginx/host.access.log  main;
-
    gzip on;
    gzip_disable "msie6";
    gzip_vary on;
@@ -14,11 +12,12 @@ server {
    gzip_http_version 1.1;
    gzip_types text/plain application/css text/css application/xml text/javascript application/javascript application/x-javascript;
 
-
    location / {
         root /usr/share/nginx/html;
         #index index.html;
         try_files $uri $uri/ /index.html;
+        client_max_body_size 300m;   #最大接受300m文件以内的
+        client_body_timeout 20s;
    }
    #error_page  404              /404.html;
 
@@ -28,5 +27,4 @@ server {
    location = /50x.html {
       root   /usr/share/nginx/html;
    }
-
 }