Showing
3 changed files
with
62 additions
and
26 deletions
1 | 1 | ||
2 | ## old idc | 2 | ## old idc |
3 | - #location = /erp2goods { | ||
4 | - # proxy_redirect off; | ||
5 | - # proxy_pass http://yohobuy-old-www; | ||
6 | - # proxy_set_header Host $host; | ||
7 | - # proxy_set_header X-Real-IP $remote_addr; | ||
8 | - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
9 | - # proxy_set_header Accept-Encoding "gzip"; | ||
10 | - # } | ||
11 | - | ||
12 | location ^~ /passport/auth/signin { | 3 | location ^~ /passport/auth/signin { |
13 | proxy_redirect off; | 4 | proxy_redirect off; |
14 | proxy_pass http://yohobuy-old-www; | 5 | proxy_pass http://yohobuy-old-www; |
@@ -28,12 +19,7 @@ | @@ -28,12 +19,7 @@ | ||
28 | } | 19 | } |
29 | 20 | ||
30 | location = /yohoshow { | 21 | location = /yohoshow { |
31 | - proxy_redirect off; | ||
32 | - proxy_pass http://yohobuy-old-www; | ||
33 | - proxy_set_header Host $host; | ||
34 | - proxy_set_header X-Real-IP $remote_addr; | ||
35 | - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
36 | - proxy_set_header Accept-Encoding "gzip"; | 22 | + return 301 http://$host; |
37 | } | 23 | } |
38 | 24 | ||
39 | location =/product/specials { | 25 | location =/product/specials { |
@@ -57,24 +43,20 @@ | @@ -57,24 +43,20 @@ | ||
57 | } | 43 | } |
58 | 44 | ||
59 | location = /search { | 45 | location = /search { |
60 | - return 301 http://search.yohobuy.com$request_uri; | 46 | + # return 301 http://search.yohobuy.com$request_uri; |
47 | + rewrite /search http://search.yohobuy.com permanent; | ||
61 | } | 48 | } |
62 | 49 | ||
63 | location ^~ /logout_ { | 50 | location ^~ /logout_ { |
64 | rewrite ^/logout_(.+).html http://www.yohobuy.com/logout.html?token=$1; | 51 | rewrite ^/logout_(.+).html http://www.yohobuy.com/logout.html?token=$1; |
65 | } | 52 | } |
66 | 53 | ||
67 | - # location ^~ /product/pro_ { | ||
68 | - # return 301 http://item.yohobuy.com$request_uri; | ||
69 | - # } | ||
70 | - | ||
71 | location ^~ /product/pro_ { | 54 | location ^~ /product/pro_ { |
72 | - proxy_redirect off; | ||
73 | - proxy_pass http://yohobuy; | ||
74 | - proxy_set_header Host item.yohobuy.com; | ||
75 | - proxy_set_header X-Real-IP $remote_addr; | ||
76 | - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
77 | - proxy_set_header Accept-Encoding "gzip"; | 55 | + return 301 http://item.yohobuy.com$request_uri; |
56 | + } | ||
57 | + | ||
58 | + location = /sale { | ||
59 | + rewrite /sale http://www.yohobuy.com/product/sale/ permanent; | ||
78 | } | 60 | } |
79 | 61 | ||
80 | location ^~ /brands/ { | 62 | location ^~ /brands/ { |
1 | +location ^~ /passport/autosign/wechat/ { | ||
2 | + proxy_redirect off; | ||
3 | + proxy_pass http://yohobuy-node; | ||
4 | + proxy_set_header Host $host; | ||
5 | + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
6 | + proxy_set_header Accept-Encoding "gzip"; | ||
7 | + } | ||
8 | + | ||
9 | + location ^~ /passport/login/wechat/ { | ||
10 | + proxy_redirect off; | ||
11 | + proxy_pass http://yohobuy-node; | ||
12 | + proxy_set_header Host $host; | ||
13 | + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
14 | + proxy_set_header Accept-Encoding "gzip"; | ||
15 | + } | ||
16 | + | ||
17 | + location = /product/index/getNodeContent { | ||
18 | + proxy_redirect off; | ||
19 | + proxy_pass http://yohobuy-node; | ||
20 | + proxy_set_header Host $host; | ||
21 | + proxy_set_header X-Real-IP $remote_addr; | ||
22 | + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
23 | + proxy_set_header Accept-Encoding "gzip"; | ||
24 | + } | ||
25 | + | ||
26 | + location ^~ /product/sale/ { | ||
27 | + proxy_redirect off; | ||
28 | + proxy_pass http://yohobuy-node; | ||
29 | + proxy_set_header Host $host; | ||
30 | + proxy_set_header X-Real-IP $remote_addr; | ||
31 | + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
32 | + proxy_set_header Accept-Encoding "gzip"; | ||
33 | + } | ||
34 | + | ||
35 | + location ^~ /product/outlets/ { | ||
36 | + proxy_redirect off; | ||
37 | + proxy_pass http://yohobuy-node; | ||
38 | + proxy_set_header Host $host; | ||
39 | + proxy_set_header X-Real-IP $remote_addr; | ||
40 | + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
41 | + proxy_set_header Accept-Encoding "gzip"; | ||
42 | + } | ||
43 | + | ||
44 | + location ^~ /product/sale/ { | ||
45 | + proxy_redirect off; | ||
46 | + proxy_pass http://yohobuy-node; | ||
47 | + proxy_set_header Host $host; | ||
48 | + proxy_set_header X-Real-IP $remote_addr; | ||
49 | + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
50 | + proxy_set_header Accept-Encoding "gzip"; | ||
51 | + } |
@@ -165,6 +165,9 @@ server | @@ -165,6 +165,9 @@ server | ||
165 | 165 | ||
166 | error_log /Data/logs/error_pc.yohobuy.com.log warn; | 166 | error_log /Data/logs/error_pc.yohobuy.com.log warn; |
167 | 167 | ||
168 | + # https key | ||
169 | + include vhosts/location/yohobuypc_httpskey.conf; | ||
170 | + | ||
168 | location = / { | 171 | location = / { |
169 | return 301 https://www.yohobuy.com/; | 172 | return 301 https://www.yohobuy.com/; |
170 | } | 173 | } |
-
Please register or login to post a comment