More rework of haproxy.cfg

Signed-off-by: Ryan Benoit <rdbenoit@me.com>