From 6953fe31431d6dd8a527e082b2608716953cc5b5 Mon Sep 17 00:00:00 2001
From: sullrich <sullrich@pfsense.org>
Date: Wed, 16 Dec 2009 10:25:03 -0500
Subject: Seperate out ports to one port per server per line

---
 config/haproxy/haproxy.inc | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'config/haproxy/haproxy.inc')

diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc
index 6e8c4261..0890dbc7 100644
--- a/config/haproxy/haproxy.inc
+++ b/config/haproxy/haproxy.inc
@@ -212,26 +212,22 @@ function haproxy_configure() {
 						if($backends == "")
 							continue;
 						if($backends == $backend['name']) {
+							$server_ports = array();
 							if($server['status']=='active') {
 								if($server['cookie']) 
 									$cookie = " cookie {$server['cookie']} ";
 								else 
 									$cookie = "";
 								if(!$server['port']) {
-									$server_ports = "";
-									$isfirst = true;
 									foreach($ports as $port) {
-										if($port) {
-											if(!$isfirst)
-												$server_ports .= ",";
-											$server_ports .= $port;
-											$isfirst = false;
-										}
+										if($port) 
+											$server_ports[] = $port;
 									}
 								} else {
-									$server_ports = $server['port'];
+									$server_ports[] = $server['port'];
 								}
-								fwrite ($fd, "\tserver\t\t\t" . $server['name'] . " " . $server['address'].":" . $server_ports . " $cookie " . " check inter 1000 weight " . $server['weight'] . "\n");
+								foreach($server_ports as $pport) 
+									fwrite ($fd, "\tserver\t\t\t" . $server['name'] . " " . $server['address'].":" . $pport . " $cookie " . " check inter 1000 weight " . $server['weight'] . "\n");
 							}
 						}
 					}
-- 
cgit v1.2.3