ops / yoho-ansible-roles · Commits

Go to a project

Authored by chunhua.zhang
Commit d05f1022d9de04b0cc917de45d2247eb1a1bfd2f 2 parents 3a99e300 8e6010d0

Merge branch 'web-nginx' into 'master' 

刷新web-nginx配置文件



See merge request !122
Inline Side-by-side
Showing 2 changed files with 41 additions and 10 deletions
1 location =/app.html { 1 location =/app.html {
2 - access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log fenxi; 2 + access_log /Data/logs/nginx/access.m.yohobuy.com.log fenxi;
3 return 301 http://www.yoho.cn; 3 return 301 http://www.yoho.cn;
4 } 4 }
5 location =/yohood.html { 5 location =/yohood.html {
6 - access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log fenxi; 6 + access_log /Data/logs/nginx/access.m.yohobuy.com.log fenxi;
7 return 301 http://www.yohood.cn/; 7 return 301 http://www.yohood.cn/;
8 } 8 }
9 location ^~ /home/lottery { 9 location ^~ /home/lottery {
10 - access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log fenxi; 10 + access_log /Data/logs/nginx/access.m.yohobuy.com.log fenxi;
11 return 301 https://m.yohobuy.com; 11 return 301 https://m.yohobuy.com;
12 } 12 }
13 location ^~ /wechat { 13 location ^~ /wechat {
14 - access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log fenxi; 14 + access_log /Data/logs/nginx/access.m.yohobuy.com.log fenxi;
15 return 301 https://m.yohobuy.com; 15 return 301 https://m.yohobuy.com;
16 } 16 }
17 location ^~ /huodong { 17 location ^~ /huodong {
18 - access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log fenxi; 18 + access_log /Data/logs/nginx/access.m.yohobuy.com.log fenxi;
19 return 301 https://m.yohobuy.com; 19 return 301 https://m.yohobuy.com;
20 } 20 }
21 location ^~ /download { 21 location ^~ /download {
22 - access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log fenxi; 22 + access_log /Data/logs/nginx/access.m.yohobuy.com.log fenxi;
23 return 301 http://www.yoho.cn; 23 return 301 http://www.yoho.cn;
24 } 24 }
25 location ^~ /appactive { 25 location ^~ /appactive {
26 - access_log /Data/logs/nginx/yohobuywap-node/access.m.yohobuy.com.log fenxi; 26 + access_log /Data/logs/nginx/access.m.yohobuy.com.log fenxi;
27 return 301 http://www.yoho.cn; 27 return 301 http://www.yoho.cn;
28 } 28 }
29 location =/product/new/index { 29 location =/product/new/index {
@@ -82,4 +82,4 @@ location = /503.html { @@ -82,4 +82,4 @@ location = /503.html {
82 return 200 ''; 82 return 200 '';
83 } 83 }
84 return 302 http://www.yohobuy.com/; 84 return 302 http://www.yohobuy.com/;
85 -}  
  85 +}
@@ -27,15 +27,46 @@ @@ -27,15 +27,46 @@
27 when: item not in groups 27 when: item not in groups
28 with_items: 28 with_items:
29 - web-nginx 29 - web-nginx
30 - - name: copy statics files to openresty 30 +
  31 + - name: copy yohobuywap-node statics files to openresty
31 copy: 32 copy:
32 src: 'templates/web-nginx/node/yohobuywap-node/current/yohobuywap-node/public/static/' 33 src: 'templates/web-nginx/node/yohobuywap-node/current/yohobuywap-node/public/static/'
33 dest: "/Data/node/yohobuywap-node/current/yohobuywap-node/public/static/" 34 dest: "/Data/node/yohobuywap-node/current/yohobuywap-node/public/static/"
34 35
  36 + - name: copy action-yoho-cn statics files to openresty
  37 + copy:
  38 + src: 'templates/web-nginx/node/action-yoho-cn/current/action-yoho-cn/public/static/'
  39 + dest: "/Data/node/action-yoho-cn/current/action-yoho-cn/public/static/"
  40 +
  41 + - name: copy PE files to openresty
  42 + copy:
  43 + src: templates/web-nginx/PE/
  44 + dest: "/Data/PE/"
  45 +
  46 + - name: copy vhosts conf files to openresty
  47 + copy:
  48 + src: 'templates/web-nginx/vhosts/{{ item }}'
  49 + dest: "{{ path }}/nginx/conf/vhosts/"
  50 + with_items:
  51 + - location
  52 + - lua_modules
  53 + - pc
  54 + - wap
  55 +
35 - name: copy vhosts conf files to openresty 56 - name: copy vhosts conf files to openresty
36 template: 57 template:
37 - src: web-nginx/vhosts/activity.yohocn.conf 58 + src: web-nginx/vhosts/{{ item }}
38 dest: "{{ path }}/nginx/conf/vhosts/" 59 dest: "{{ path }}/nginx/conf/vhosts/"
  60 + with_items:
  61 + - activity.yohocn.conf
  62 + - action.yohocn.conf
  63 + - shopmanage.yohobuy.com.conf
  64 + - xianyu.yohobuy.com.conf
  65 + - yohobuypc_spider.conf
  66 + - yohobuypc.conf
  67 + - yohobuywap.conf
  68 + - yohoglobalbs.conf
  69 + - gourl.yohobuy.com.conf
39 70
40 - name: update nginx upstream for nginx.conf 71 - name: update nginx upstream for nginx.conf
41 template: 72 template: