diff options
| author | PiBa-NL <pba_2k3@yahoo.com> | 2015-04-03 21:24:01 +0200 |
|---|---|---|
| committer | PiBa-NL <pba_2k3@yahoo.com> | 2015-04-03 21:24:01 +0200 |
| commit | 5e5ccc1d1a9536c120572c01e70157908ca03704 (patch) | |
| tree | 4dbc8b8797d441a8aa2a0e434fb39b4c9487b441 /config | |
| parent | 921f05b5f350ef0d39e93fe9b1c8efac7dd8b64d (diff) | |
| download | pfsense-packages-5e5ccc1d1a9536c120572c01e70157908ca03704.tar.gz pfsense-packages-5e5ccc1d1a9536c120572c01e70157908ca03704.tar.bz2 pfsense-packages-5e5ccc1d1a9536c120572c01e70157908ca03704.zip | |
haproxy 1.5, bump version on 2.2 to 1.5.11, move advanced settings below forwardfor to avoid a (possible) warning
Diffstat (limited to 'config')
| -rw-r--r-- | config/haproxy-devel/pkg/haproxy.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc index 495f59c0..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 = ""; |