From b00b3a9deeaf9ad23a3e4c14e35457e53a5502e0 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Mon, 28 Dec 2009 16:19:33 -0500 Subject: Turn c/r into spaces for multiple options per line --- config/haproxy/haproxy.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config/haproxy') diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc index 61909e90..35f8ecac 100644 --- a/config/haproxy/haproxy.inc +++ b/config/haproxy/haproxy.inc @@ -109,7 +109,7 @@ function haproxy_configure() { if(is_array($a_global)) { fwrite ($fd, "global\n"); if($a_global['advanced']) - fwrite ($fd, "\t" . $a_global['advanced'] . "\n"); + fwrite ($fd, "\t" . str_replace("\n", " ", $a_global['advanced']) . "\n"); fwrite ($fd, "\tmaxconn\t\t\t".$a_global['maxconn']."\n"); if($a_global['remotesyslog']) fwrite ($fd, "\tlog\t\t\t{$a_global['remotesyslog']}\n"); @@ -153,7 +153,7 @@ function haproxy_configure() { // Advanced pass trhu if($backend['advanced']) - fwrite ($fd, "\t{$backend['advanced']}\n"); + fwrite ($fd, "\t" . str_replace("\n", " ", $backend['advanced']) . "\n"); // https is an alias for tcp for clarity purpouses if(strtolower($backend['type']) == "https") { @@ -234,7 +234,7 @@ function haproxy_configure() { $server_ports[] = $server['port']; } if($server['advanced']) - $advanced_txt = " " . $server['advanced']; + $advanced_txt = " " . str_replace("\n", " ", $server['advanced']); else $advanced_txt = ""; foreach($server_ports as $pport) -- cgit v1.2.3