Authored by Your Name

Merge branch 'master' of git.yoho.cn:ops/yoho-ansible-roles

@@ -7,7 +7,7 @@ server { @@ -7,7 +7,7 @@ server {
7 proxy_set_header Connection ""; 7 proxy_set_header Connection "";
8 8
9 9
10 - server_name 2.yohobuy.com; 10 + server_name 2.yohobuy.com ufoapi.yohoops.org;
11 11
12 12
13 access_log /Data/logs/nginx/ufo_access.log fenxi; 13 access_log /Data/logs/nginx/ufo_access.log fenxi;
@@ -213,7 +213,7 @@ read.ufo IN A 10.66.6.52 @@ -213,7 +213,7 @@ read.ufo IN A 10.66.6.52
213 redis.ufo IN A 10.66.70.247 213 redis.ufo IN A 10.66.70.247
214 write.ufo IN A 10.66.6.45 214 write.ufo IN A 10.66.6.45
215 zkufo IN A 10.66.70.165 215 zkufo IN A 10.66.70.165
216 - 216 +ufoapi IN A 10.66.4.112
217 217
218 ;global 218 ;global
219 global.redis IN A 10.66.5.187 219 global.redis IN A 10.66.5.187