Merge branch 'web-nginx' into 'master'

刷新web-nginx配置文件



See merge request !122

 location =/app.html {
-    access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log  fenxi;
+    access_log /Data/logs/nginx/access.m.yohobuy.com.log  fenxi;
     return 301 http://www.yoho.cn;
 }
 location =/yohood.html {
-    access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log  fenxi;
+    access_log /Data/logs/nginx/access.m.yohobuy.com.log  fenxi;
     return 301 http://www.yohood.cn/;
 }
 location ^~ /home/lottery {
-    access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log  fenxi;
+    access_log /Data/logs/nginx/access.m.yohobuy.com.log  fenxi;
     return 301 https://m.yohobuy.com;
 }
 location ^~ /wechat {
-    access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log  fenxi;
+    access_log /Data/logs/nginx/access.m.yohobuy.com.log  fenxi;
     return 301 https://m.yohobuy.com;
 }
 location ^~ /huodong {
-    access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log  fenxi;
+    access_log /Data/logs/nginx/access.m.yohobuy.com.log  fenxi;
     return 301 https://m.yohobuy.com;
 }
 location ^~ /download {
-    access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log  fenxi;
+    access_log /Data/logs/nginx/access.m.yohobuy.com.log  fenxi;
     return 301 http://www.yoho.cn;
 }
 location ^~ /appactive {
-    access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log  fenxi;
+    access_log /Data/logs/nginx/access.m.yohobuy.com.log  fenxi;
     return 301 http://www.yoho.cn;
 }
 location =/product/new/index {
@@ -82,4 +82,4 @@ location = /503.html {
         return 200 '';
     }
     return 302 http://www.yohobuy.com/;
-}
\ No newline at end of file
+}

@@ -27,15 +27,46 @@
       when: item not in groups
       with_items:
         - web-nginx
-    - name: copy statics files to openresty
+
+    - name: copy yohobuywap-node statics files to openresty
       copy:
         src: 'templates/web-nginx/node/yohobuywap-node/current/yohobuywap-node/public/static/'
         dest: "/Data/node/yohobuywap-node/current/yohobuywap-node/public/static/"
 
+    - name: copy action-yoho-cn statics files to openresty
+      copy:
+        src: 'templates/web-nginx/node/action-yoho-cn/current/action-yoho-cn/public/static/'
+        dest: "/Data/node/action-yoho-cn/current/action-yoho-cn/public/static/"
+
+    - name: copy PE files to openresty 
+      copy:
+        src: templates/web-nginx/PE/
+        dest: "/Data/PE/"
+
+    - name: copy vhosts conf files to openresty
+      copy:
+        src: 'templates/web-nginx/vhosts/{{ item }}'
+        dest: "{{ path }}/nginx/conf/vhosts/"
+      with_items:
+        - location
+        - lua_modules
+        - pc
+        - wap
+
     - name: copy vhosts conf files to openresty
       template:
-        src: web-nginx/vhosts/activity.yohocn.conf
+        src: web-nginx/vhosts/{{ item }}
         dest: "{{ path }}/nginx/conf/vhosts/"
+      with_items:
+        - activity.yohocn.conf
+        - action.yohocn.conf
+        - shopmanage.yohobuy.com.conf
+        - xianyu.yohobuy.com.conf
+        - yohobuypc_spider.conf
+        - yohobuypc.conf
+        - yohobuywap.conf
+        - yohoglobalbs.conf
+        - gourl.yohobuy.com.conf
 
     - name: update nginx upstream for nginx.conf
       template: