add php-fpm
add haproxy
Merge branch 'master' of https://github.com/haoyanfei/configure