diff options
Diffstat (limited to 'config/haproxy-devel')
| -rw-r--r-- | config/haproxy-devel/pkg/haproxy.inc | 26 | ||||
| -rw-r--r-- | config/haproxy-devel/pkg/haproxy_utils.inc | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc index 15fbcd17..135f2d4f 100644 --- a/config/haproxy-devel/pkg/haproxy.inc +++ b/config/haproxy-devel/pkg/haproxy.inc @@ -1087,16 +1087,6 @@ function haproxy_writeconf($configpath) { fwrite ($fd, "\tbind /tmp/haproxy_chroot/{$bind['name']}.socket name unixsocket accept-proxy {$ssl_info} {$advanced_bind}\n"); } - // Advanced pass thru - if($bind['advanced']) { - $advanced = explode("\n", base64_decode($bind['advanced'])); - foreach($advanced as $adv_line) { - if ($adv_line != "") { - fwrite($fd, "\t" . str_replace("\r", "", $adv_line) . "\n"); - } - } - } - // https is an alias for tcp for clarity purposes if($bind['type'] == "https") { $backend_type = "tcp"; @@ -1142,6 +1132,16 @@ function haproxy_writeconf($configpath) { fwrite ($fd, "\ttimeout client\t\t" . $bind['client_timeout'] . "\n"); + + // Advanced pass thru + if($bind['advanced']) { + $advanced = explode("\n", base64_decode($bind['advanced'])); + foreach($advanced as $adv_line) { + if ($adv_line != "") { + fwrite($fd, "\t" . str_replace("\r", "", $adv_line) . "\n"); + } + } + } // Combine the rest of the frontend configs $default_backend = ""; @@ -1302,7 +1302,7 @@ function haproxy_writeconf($configpath) { } if ($inspectdelay > 0) - fwrite ($fd, "\ttcp-request inspect-delay\t" . $inspectdelay . "\n"); + fwrite ($fd, "\ttcp-request inspect-delay\t" . $inspectdelay . "s\n"); // Write acl's first, so they may be used by advanced text options written by user. fwrite ($fd, $config_acls); @@ -1897,9 +1897,9 @@ function get_frontend_acls($frontend) { // Filter out acls for different modes if ($acl['mode'] != '' && $acl['mode'] != strtolower($mainfrontend['type'])) continue; - $not = $entry['not'] == "yes" ? "not " : ""; + $not = $entry['not'] == "yes" ? "not: " : ""; $acl_item = array(); - $acl_item['descr'] = $acl['name'] . " " . (isset($acl['novalue']) ? "" : $entry['value']); + $acl_item['descr'] = $acl['name'] . " " . (isset($acl['novalue']) ? "" : $not . $entry['value']); $acl_item['ref'] = $entry; $result[] = $acl_item; diff --git a/config/haproxy-devel/pkg/haproxy_utils.inc b/config/haproxy-devel/pkg/haproxy_utils.inc index 4b945c06..d8c4faf4 100644 --- a/config/haproxy-devel/pkg/haproxy_utils.inc +++ b/config/haproxy-devel/pkg/haproxy_utils.inc @@ -354,7 +354,7 @@ function haproxy_get_certificates($type = 'server,user', $get_includeWebCert=fal $ok |= stristr($type,',user,') && $purpose['server'] != 'Yes'; if (!$ok) continue; - if ($get_includeWebCert == false && is_webgui_cert($cert['refid'])) + if ($get_includeWebCert == false && $cert['descr'] == "webConfigurator default") continue; $certificates[$cert['refid']]['name'] = haproxy_get_certificate_descriptivename($cert); } |