dev

docker/compose/lz-acc/docker-compose.yml

@@ -28,6 +28,7 @@ services:
       - /nfs/upload:/var/www/html/data/upload
       - /nfs/merchant:/var/www/html/merchant
       - ../../conf/nginx/cert:/etc/nginx/cert
+      - /nfs/icp:/var/www/html/icp
       - ../../conf/nginx/nginx-linzh-https.conf:/etc/nginx/nginx.conf:ro
     container_name: "panda-nginx-https"
     command: [nginx,'-g','daemon off;']

docker/conf/nginx/nginx-linzh-http.conf

@@ -100,4 +100,9 @@ http
             include        fastcgi_params;
         }
     }
+    server {
+        listen       80;
+        server_name xyzshops.cn 121.89.212.167;
+        return 301 https://www.xyzshops.cn$request_uri;
+    }
 }

docker/conf/nginx/nginx-linzh-https.conf

@@ -118,4 +118,10 @@ http
             include        fastcgi_params;
         }
     }
+
+    server {
+        listen       443 ssl;
+        server_name lzkj168.cn;
+        return 301 https://www.lzkj168.cn$request_uri;
+    }
 }