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

* 'master' of git.yoho.cn:ops/yoho-ansible-roles:
  Update redirect.lua

# Conflicts:
#	roles/openresty/files/java-nginx-config/nginx/conf/redirect.lua

@@ -114,4 +114,5 @@ function main()
      end
      end
 end
 end
 
 
-- 
+------ run ------- 
+main()