diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-11-20 18:06:22 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-11-20 18:06:22 -0500 |
| commit | 7840cc8ce79668aa9e479ee0464474269ca04196 (patch) | |
| tree | 51c05a95f3d3337d50937d2c51ea91cb260ae7e9 | |
| parent | b92a11202685093e004c3fe6a3ef35884622e511 (diff) | |
| download | pfsense-packages-7840cc8ce79668aa9e479ee0464474269ca04196.tar.gz pfsense-packages-7840cc8ce79668aa9e479ee0464474269ca04196.tar.bz2 pfsense-packages-7840cc8ce79668aa9e479ee0464474269ca04196.zip | |
Do not clobber backend variable. Do not clobber listenip. Vesoion bump for haproxy
| -rw-r--r-- | config/haproxy/haproxy.inc | 19 | ||||
| -rwxr-xr-x | pkg_config.7.xml | 2 | ||||
| -rwxr-xr-x | pkg_config.8.xml | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc index e5aabb38..f3203ab2 100644 --- a/config/haproxy/haproxy.inc +++ b/config/haproxy/haproxy.inc @@ -124,25 +124,28 @@ function haproxy_configure() { foreach ($a_backends as $backend) { // Define our backend name - $backend = "listen {$backend['name']}\n"; + $backendinfo = "listen {$backend['name']}\n"; // Prepare ports for processing by splitting - $backend['port'] .= ","; - $ports = split(",", $backend['port']); - + $portss = "{$backend['port']},"; + $ports = split(",", $portss); + + // Initialize variable + $listenip = ""; + // Process and add bind directives for ports foreach($ports as $port) { if($port) { if($backend['extaddr'] == "any") - $listenip = "bind\t\t\t0.0.0.0:" . $port . "\n"; + $listenip .= "\tbind\t\t\t0.0.0.0:{$port}\n"; elseif($backend['extaddr']) - $listenip = "bind\t\t\t" . $backend['extaddr'] . ":" . $port ."\n"; + $listenip .= "\tbind\t\t\t{$backend['extaddr']}:{$port}\n"; else - $listenip = "bind\t\t\t" . get_current_wan_address('wan').":" . $port ."\n"; + $listenip .= "\tbind\t\t\t" . get_current_wan_address('wan') . ":{$port}\n"; } } - fwrite ($fd, "{$backend}"); + fwrite ($fd, "{$backendinfo}"); fwrite ($fd, "{$listenip}"); fwrite ($fd, "\tmode\t\t\t".$backend['type'] . "\n"); fwrite ($fd, "\tlog\t\t\tglobal\n"); diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 0b2892e2..290f15df 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -19,7 +19,7 @@ <descr>The Reliable, High Performance TCP/HTTP Load Balancer</descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>0.12</version> + <version>0.13</version> <status>BETA</status> <required_version>1.2.3</required_version> <config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 5858f10e..ee7c828d 100755 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -19,7 +19,7 @@ <descr>The Reliable, High Performance TCP/HTTP Load Balancer</descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>0.12</version> + <version>0.13</version> <status>BETA</status> <required_version>1.2.3</required_version> <config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file> |