Merge pull request #1135 from PiBa-NL/haproxy_pkg0.32RELENG_2_2_5

7 files changed, 24 insertions, 9 deletions

diff --git a/config/haproxy-devel/haproxy.xml b/config/haproxy-devel/haproxy.xml
index 784e0034..19b6b577 100644
--- a/config/haproxy-devel/haproxy.xml
+++ b/config/haproxy-devel/haproxy.xml
@@ -42,7 +42,7 @@
 	]]>
 	</copyright>
 	<name>haproxy</name>
-	<version>0.32</version>
+	<version>0.33</version>
 	<title>HAProxy</title>
 	<aftersaveredirect>/pkg_edit.php?xml=haproxy_pools.php</aftersaveredirect>
 	<include_file>/usr/local/pkg/haproxy.inc</include_file>
diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc
index 638ece28..3d614fe0 100644
--- a/config/haproxy-devel/pkg/haproxy.inc
+++ b/config/haproxy-devel/pkg/haproxy.inc
@@ -766,7 +766,8 @@ function write_backend($configpath, $fd, $name, $pool, $backendsettings) {
 		$backend_mode = $frontendtype;
 	}
 	fwrite ($fd, "\tmode\t\t\t" . $backend_mode . "\n");
-	
+	fwrite ($fd, "\tlog\t\t\tglobal\n");
+
 	$use_haproxyresolvers = false;
 	if (haproxy_version() >= '1.6') {
 		$use_mailers = is_array($a_mailers) && count($a_mailers) > 0;
@@ -1460,6 +1461,18 @@ function haproxy_writeconf($configpath) {
 	$a_mailers = &$config['installedpackages']['haproxy']['email_mailers']['item'];
 	$a_resolvers = &$config['installedpackages']['haproxy']['dns_resolvers']['item'];
 	$a_files = &$config['installedpackages']['haproxy']['files']['item'];
+	if (!is_array($a_frontends)) {
+		$a_frontends = array();
+	}
+	if (!is_array($a_backends)) {
+		$a_backends = array();
+	}
+	if (!is_array($a_mailers)) {
+		$a_mailers = array();
+	}
+	if (!is_array($a_resolvers)) {
+		$a_resolvers = array();
+	}
 	
 	$fd = fopen($configfile, "w");
 	if (is_array($a_global)) {
diff --git a/config/haproxy-devel/www/haproxy_listeners_edit.php b/config/haproxy-devel/www/haproxy_listeners_edit.php
index 9d2b0b05..8e6c1c3d 100644
--- a/config/haproxy-devel/www/haproxy_listeners_edit.php
+++ b/config/haproxy-devel/www/haproxy_listeners_edit.php
@@ -283,6 +283,7 @@ if (isset($id) && $a_backend[$id]) {
 
 if (isset($_GET['dup'])) {
 	unset($id);
+	$pconfig['name'] .= "-copy";
 	if ($pconfig['secondary'] != 'yes')
 		$pconfig['primary_frontend'] = $pconfig['name'];
 }
diff --git a/config/haproxy-devel/www/haproxy_pool_edit.php b/config/haproxy-devel/www/haproxy_pool_edit.php
index 71da9732..2b4787f3 100644
--- a/config/haproxy-devel/www/haproxy_pool_edit.php
+++ b/config/haproxy-devel/www/haproxy_pool_edit.php
@@ -323,9 +323,10 @@ if (isset($id) && $a_pools[$id]) {
 	}
 }
 
-if (isset($_GET['dup']))
+if (isset($_GET['dup'])) {
 	unset($id);
-
+	$pconfig['name'] .= "-copy";
+}
 $changedesc = "Services: HAProxy: Backend server pool: ";
 $changecount = 0;
 
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 4065c679..06fddae7 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -166,12 +166,12 @@
 			The Reliable, High Performance TCP/HTTP(S) Load Balancer.<br />
 			This package implements the TCP, HTTP and HTTPS balancing features from haproxy.<br />
 			Supports ACLs for smart backend switching.<br />
-			<strong>As of pkg v0.27 switched to using 1.6dev releases. If you need stable, switch to haproxy-1_5 package.</strong>
+			<strong>As of pkg v0.33 switched to using 1.6 stable releases.</strong>
 			]]>
 		</descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>0.32</version>
+		<version>0.33</version>
 		<status>Release</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
@@ -179,7 +179,7 @@
 		<run_depends>sbin/haproxy:net/haproxy</run_depends>
 		<port_category>net</port_category>
 		<conflicts>haproxy</conflicts>
-		<depends_on_package_pbi>haproxy-devel-1.6-dev4-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>haproxy-1.6.2_1-##ARCH##.pbi</depends_on_package_pbi>
 		<build_pbi>
 			<ports_before>security/openssl lang/lua53</ports_before>
 			<custom_name>haproxy</custom_name>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 4a567bdf..d4032e66 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -190,7 +190,7 @@
 				Supports ACLs for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.5.3 pkg v 0.32</version>
+		<version>1.5.3 pkg v 0.33</version>
 		<status>Release</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index cc9ada3c..76bff1ec 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -177,7 +177,7 @@
 				Supports ACLs for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.5.3 pkg v 0.32</version>
+		<version>1.5.3 pkg v 0.33</version>
 		<status>Release</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>