From c0d7d735d6da067633da3fe4b0dd2db9d19b36db Mon Sep 17 00:00:00 2001
From: Andrew Thompson <andrew@clonedev.co.nz>
Date: Thu, 26 Jan 2012 19:58:57 +1300
Subject: Move haproxy-dev to haproxy proper, ticket ZVS-164444

---
 config/haproxy/haproxy.xml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'config/haproxy/haproxy.xml')

diff --git a/config/haproxy/haproxy.xml b/config/haproxy/haproxy.xml
index bc338764..83e2ca5d 100644
--- a/config/haproxy/haproxy.xml
+++ b/config/haproxy/haproxy.xml
@@ -44,13 +44,13 @@
 	<name>haproxy</name>
 	<version>1.0</version>
 	<title>HAProxy</title>
-	<aftersaveredirect>/pkg_edit.php?xml=haproxy_servers.php</aftersaveredirect>
+	<aftersaveredirect>/pkg_edit.php?xml=haproxy_pools.php</aftersaveredirect>
 	<include_file>/usr/local/pkg/haproxy.inc</include_file>
 	<menu>
 		<name>HAProxy</name>
 		<tooltiptext></tooltiptext>
 		<section>Services</section>
-		<url>/haproxy_global.php</url>
+		<url>/haproxy_listeners.php</url>
 	</menu>
 	<service>
 		<name>HAProxy</name>
@@ -62,32 +62,32 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/haproxy/haproxy.inc</item>
+		<item>http://www.pfsense.com/packages/config/haproxy-dev/haproxy.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/haproxy/haproxy_frontends.php</item>
+		<item>http://www.pfsense.com/packages/config/haproxy-dev/haproxy_listeners.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/haproxy/haproxy_frontends_edit.php</item>
+		<item>http://www.pfsense.com/packages/config/haproxy-dev/haproxy_listeners_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/haproxy/haproxy_global.php</item>
+		<item>http://www.pfsense.com/packages/config/haproxy-dev/haproxy_global.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/haproxy/haproxy_servers.php</item>
+		<item>http://www.pfsense.com/packages/config/haproxy-dev/haproxy_pools.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/haproxy/haproxy_servers_edit.php</item>
+		<item>http://www.pfsense.com/packages/config/haproxy-dev/haproxy_pool_edit.php</item>
 	</additional_files_needed>
 	<custom_delete_php_command>
 	</custom_delete_php_command>
@@ -96,18 +96,15 @@
 	<custom_php_resync_config_command>
 	</custom_php_resync_config_command>
 	<custom_php_install_command>
-		/*
-		included in package install
 		$freebsdv=trim(`uname -r | cut -d'.' -f1`);
 		conf_mount_rw();
-		`fetch -q -o /usr/local/sbin/ http://www.pfsense.org/packages/config/haproxy/binaries{$freebsdv}/haproxy`;
+		`fetch -q -o /usr/local/sbin/ http://www.pfsense.org/packages/config/haproxy-dev/binaries{$freebsdv}/haproxy`;
 		exec("chmod a+rx /usr/local/sbin/haproxy");
-		*/
 		haproxy_custom_php_install_command();
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
 		haproxy_custom_php_deinstall_command();
 	</custom_php_deinstall_command>
-	<custom_php_command_before_form>
+	<custom_php_command_before_form>	
 	</custom_php_command_before_form>
-</packagegui>
\ No newline at end of file
+</packagegui>
-- 
cgit v1.2.3