From 266dc3a5207a5642ee94dce1bb70d42ffd07c766 Mon Sep 17 00:00:00 2001
From: PiBa-NL <pba_2k3@yahoo.com>
Date: Sat, 4 Apr 2015 00:22:29 +0200
Subject: haproxy 1.5, move advanced settings below forwardfor to avoid a
 (possible) warning

---
 config/haproxy1_5/pkg/haproxy.inc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'config')

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 = "";
-- 
cgit v1.2.3