aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiBa-NL <pba_2k3@yahoo.com>2015-04-04 00:22:29 +0200
committerPiBa-NL <pba_2k3@yahoo.com>2015-04-04 00:22:29 +0200
commit266dc3a5207a5642ee94dce1bb70d42ffd07c766 (patch)
tree64cb0db5861d5a412ee15cdb86e2bb5dd81ab963
parent5e5ccc1d1a9536c120572c01e70157908ca03704 (diff)
downloadpfsense-packages-266dc3a5207a5642ee94dce1bb70d42ffd07c766.tar.gz
pfsense-packages-266dc3a5207a5642ee94dce1bb70d42ffd07c766.tar.bz2
pfsense-packages-266dc3a5207a5642ee94dce1bb70d42ffd07c766.zip
haproxy 1.5, move advanced settings below forwardfor to avoid a (possible) warning
-rw-r--r--config/haproxy1_5/pkg/haproxy.inc20
1 files changed, 10 insertions, 10 deletions
diff --git a/config/haproxy1_5/pkg/haproxy.inc b/config/haproxy1_5/pkg/haproxy.inc
index 495f59c0..135f2d4f 100644
--- a/config/haproxy1_5/pkg/haproxy.inc
+++ b/config/haproxy1_5/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 = "";