Move haproxy-dev to haproxy proper, ticket ZVS-164444

9 files changed, 0 insertions, 2892 deletions

diff --git a/config/haproxy-dev/binaries7/haproxy b/config/haproxy-dev/binaries7/haproxy
deleted file mode 100755
index 0474b03b..00000000
--- a/config/haproxy-dev/binaries7/haproxy
+++ /dev/null
diff --git a/config/haproxy-dev/binaries8/haproxy b/config/haproxy-dev/binaries8/haproxy
deleted file mode 100755
index 0ae3d29b..00000000
--- a/config/haproxy-dev/binaries8/haproxy
+++ /dev/null
diff --git a/config/haproxy-dev/haproxy.inc b/config/haproxy-dev/haproxy.inc
deleted file mode 100644
index 72d9535d..00000000
--- a/config/haproxy-dev/haproxy.inc
+++ /dev/null
@@ -1,764 +0,0 @@
-<?php
-/*
-    haproxy.inc
-	Copyright (C) 2009 Scott Ullrich <sullrich@pfsense.com>
-    Copyright (C) 2008 Remco Hoef
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* include all configuration functions */
-require_once("functions.inc");
-require_once("pkg-utils.inc");
-require_once("notices.inc");
-
-$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty";
-
-$a_acltypes = array();
-$a_acltypes[] = array('name' => 'host_starts_with', 'descr' => 'Host starts with',
-				'mode' => 'http', 'syntax' => 'hdr_beg(host) -i');
-$a_acltypes[] = array('name' => 'host_ends_with', 'descr' => 'Host ends with',
-				'mode' =>'http', 'syntax' => 'hdr_end(host) -i');
-$a_acltypes[] = array('name' => 'host_matches', 'descr' => 'Host matches',
-				'mode' =>'http', 'syntax' => 'hdr(host) -i');
-$a_acltypes[] = array('name' => 'host_regex', 'descr' => 'Host regex',
-				'mode' =>'http', 'syntax' => 'hdr_reg(host) -i');
-$a_acltypes[] = array('name' => 'host_contains', 'descr' => 'Host contains',
-				'mode' => 'http', 'syntax' => 'hdr_dir(host) -i');
-$a_acltypes[] = array('name' => 'path_starts_with', 'descr' => 'Path starts with',
-				'mode' => 'http', 'syntax' => 'path_beg -i');
-$a_acltypes[] = array('name' => 'path_ends_with', 'descr' => 'Path ends with',
-				'mode' => 'http', 'syntax' => 'path_end -i');
-$a_acltypes[] = array('name' => 'path_matches', 'descr' => 'Path matches',
-				'mode' => 'http', 'syntax' => 'path -i');
-$a_acltypes[] = array('name' => 'path_regex', 'descr' => 'Path regex',
-				'mode' => 'http', 'syntax' => 'path_reg -i');
-$a_acltypes[] = array('name' => 'path_contains', 'descr' => 'Path contains',
-				'mode' => 'http', 'syntax' => 'path_dir -i');
-$a_acltypes[] = array('name' => 'source_ip', 'descr' => 'Source IP',
-				'mode' => '', 'syntax' => 'src');
-
-function haproxy_custom_php_deinstall_command() {
-	exec("rm /usr/local/sbin/haproxy");
-	exec("rm /usr/local/pkg/haproxy.inc");
-	exec("rm /usr/local/www/haproxy*");
-	exec("rm /usr/local/etc/rc.d/haproxy.sh");
-	exec("rm /etc/devd/haproxy.conf");
-	exec("/etc/rc.d/devd restart");
-	haproxy_install_cron(false);
-}
-
-function haproxy_custom_php_install_command() {
-	global $g, $config;
-	conf_mount_rw();
-
-	$haproxy = <<<EOD
-#!/bin/sh
-
-# PROVIDE: haproxy
-# REQUIRE: LOGIN
-# KEYWORD: FreeBSD
-
-. /etc/rc.subr
-
-name="haproxy"
-rcvar=`set_rcvar`
-command="/usr/local/bin/haproxy"
-haproxy_enable=\${haproxy-"YES"}
-
-start_cmd="haproxy_start"
-stop_postcmd="haproxy_stop"
-check_cmd="haproxy_check"
-extra_commands="check"
-
-load_rc_config \$name
-
-haproxy_start () {
-        echo "Starting haproxy."
-        /usr/bin/env \
-        PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
-		/usr/local/bin/php -q -d auto_prepend_file=config.inc <<ENDOFF
-		<?php
-			require_once("globals.inc");		
-			require_once("functions.inc");
-			require_once("haproxy.inc");
-			haproxy_configure();
-		?>
-ENDOFF
-}
-
-haproxy_check () {
-        echo "Checking haproxy."
-        /usr/bin/env \
-        PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
-		/usr/local/bin/php -q -d auto_prepend_file=config.inc <<ENDOFF
-		<?php
-			require_once("globals.inc");		
-			require_once("functions.inc");
-			require_once("haproxy.inc");
-			haproxy_check_run(0);
-		?>
-ENDOFF
-}
-
-haproxy_stop () {
-        echo "Stopping haproxy."
-        killall haproxy
-}
-
-run_rc_command "\$1"
-
-EOD;
-
-	$fd = fopen("/usr/local/etc/rc.d/haproxy.sh", "w");
-	fwrite($fd, $haproxy);
-	fclose($fd);
-	exec("chmod a+rx /usr/local/etc/rc.d/haproxy.sh");
-
-	$devd = <<<EOD
-notify 0 {
-        match "system"          "IFNET";
-        match "subsystem"       "carp[0-9]+";
-        match "type"            "LINK_UP";
-        action "/usr/local/etc/rc.d/haproxy.sh check";
-};
-notify 0 {
-        match "system"          "IFNET";
-        match "subsystem"       "carp[0-9]+";
-        match "type"            "LINK_DOWN";
-        action "/usr/local/etc/rc.d/haproxy.sh check";
-};
-
-EOD;
-	exec("mkdir -p /etc/devd");
-	$fd = fopen("/etc/devd/haproxy.conf", "w");
-	fwrite($fd, $devd);
-	fclose($fd);
-	exec("/etc/rc.d/devd restart");
-
-	/* Do XML upgrade from haproxy 0.31 to haproxy-dev */
-	if (is_array($config['installedpackages']['haproxy']['ha_servers'])) {
-		/* We have an old config */
-		$config['installedpackages']['haproxy']['ha_pools']['item'] = array();
-		$a_global = &$config['installedpackages']['haproxy'];
-		$a_backends = &$config['installedpackages']['haproxy']['ha_backends']['item'];
-		$a_oldservers = &$config['installedpackages']['haproxy']['ha_servers']['item'];
-		$a_pools = &$config['installedpackages']['haproxy']['ha_pools']['item'];
-
-		foreach ($a_backends as $id => $be) {
-			$a_backends[$id]['status'] = 'active';
-		}
-		$id = 0;
-		foreach ($a_oldservers as $oldserver) {
-			$pool=$oldserver;
-			/* make server sub array */
-			$server=array();
-			$server['name'] = $oldserver['name'];
-			$server['address'] = $oldserver['address'];
-			$server['port'] = $oldserver['port'];
-			$server['weight'] = $oldserver['weight'];
-			$a_servers=array();
-			$a_servers[]=$server;
-			/* set new pool */
-			$pool['name'] = "pool$id";
-			$id++;
-			$pool['ha_servers']['item']=$a_servers;
-			/* link to frontend */
-			foreach ($a_backends as $id => $be) {
-				if ($a_backends[$id]['name'] == $oldserver['backend']) {
-					$a_backends[$id]['pool'] = $pool['name'];
-					$pool['monitor_uri'] = $be['monitor_uri'];
-					unset($a_backends[$id]['monitor_uri']);
-					break;
-				}
-			}
-			unset($pool['backend']);
-			unset($pool['address']);
-			unset($pool['port']);
-			unset($pool['weight']);
-			$a_pools[] = $pool;
-		}
-		unset($config['installedpackages']['haproxy']['ha_servers']);
-		write_config();
-	}
-
-	conf_mount_ro();
-
-	exec("/usr/local/etc/rc.d/haproxy.sh start");
-}
-
-function haproxy_install_cron($should_install) {
-	global $config, $g;
-	if($g['booting']==true) 
-		return;
-	$is_installed = false;
-	if(!$config['cron']['item'])
-		return;
-	$x=0;
-	foreach($config['cron']['item'] as $item) {
-		if(strstr($item['command'], "/usr/local/etc/rc.d/haproxy.sh")) {
-			$is_installed = true;
-			break;
-		}
-		$x++;
-	}
-	switch($should_install) {
-		case true:
-			if(!$is_installed) {
-				$cron_item = array();
-				$cron_item['minute'] = "*/2";
-				$cron_item['hour'] = "*";
-				$cron_item['mday'] = "*";
-				$cron_item['month'] = "*";
-				$cron_item['wday'] = "*";
-				$cron_item['who'] = "root";
-				$cron_item['command'] = "/usr/local/etc/rc.d/haproxy.sh check";		
-				$config['cron']['item'][] = $cron_item;
-				parse_config(true);
-				write_config();
-				configure_cron();
-			}
-		break;
-		case false:
-			if($is_installed == true) {
-				if($x > 0) {
-					unset($config['cron']['item'][$x]);
-					parse_config(true);
-					write_config();
-				}
-				configure_cron();
-			}
-		break;
-	}
-}
-
-function haproxy_find_acl($name) {
-	global $a_acltypes;
-
-	/* XXX why is this broken from xmlsync? */
-	if (!$a_acltypes) {
-		$a_acltypes = array();
-		$a_acltypes[] = array('name' => 'host_starts_with', 'descr' => 'Host starts with',
-			'mode' => 'http', 'syntax' => 'hdr_beg(host) -i');
-		$a_acltypes[] = array('name' => 'host_ends_with', 'descr' => 'Host ends with',
-			'mode' =>'http', 'syntax' => 'hdr_end(host) -i');
-		$a_acltypes[] = array('name' => 'host_matches', 'descr' => 'Host matches',
-			'mode' =>'http', 'syntax' => 'hdr(host) -i');
-		$a_acltypes[] = array('name' => 'host_regex', 'descr' => 'Host regex',
-			'mode' =>'http', 'syntax' => 'hdr_reg(host) -i');
-		$a_acltypes[] = array('name' => 'host_contains', 'descr' => 'Host contains',
-			'mode' => 'http', 'syntax' => 'hdr_dir(host) -i');
-		$a_acltypes[] = array('name' => 'path_starts_with', 'descr' => 'Path starts with',
-			'mode' => 'http', 'syntax' => 'path_beg -i');
-		$a_acltypes[] = array('name' => 'path_ends_with', 'descr' => 'Path ends with',
-			'mode' => 'http', 'syntax' => 'path_end -i');
-		$a_acltypes[] = array('name' => 'path_matches', 'descr' => 'Path matches',
-			'mode' => 'http', 'syntax' => 'path -i');
-		$a_acltypes[] = array('name' => 'path_regex', 'descr' => 'Path regex',
-			'mode' => 'http', 'syntax' => 'path_reg -i');
-		$a_acltypes[] = array('name' => 'path_contains', 'descr' => 'Path contains',
-			'mode' => 'http', 'syntax' => 'path_dir -i');
-		$a_acltypes[] = array('name' => 'source_ip', 'descr' => 'Source IP',
-			'mode' => '', 'syntax' => 'src');
-	}
-
-	if($a_acltypes) {
-		foreach ($a_acltypes as $acl) {
-			if ($acl['name'] == $name)
-				return $acl;
-		}
-	}
-}
-
-function write_backend($fd, $name, $pool, $frontend) {
-	if(!is_array($pool['ha_servers']['item']))
-		return;
-
-	fwrite ($fd, "backend " . $name . "\n");
-	if($pool['cookie_name'] && strtolower($frontend['type']) == "http")
-		fwrite ($fd, "\tcookie\t\t\t" . $pool['cookie_name'] . " insert indirect\n");
-
-	// https is an alias for tcp for clarity purpouses
-	if(strtolower($frontend['type']) == "https") {
-		$backend_type = "tcp";
-		$httpchk = "ssl-hello-chk";
-	} else { 
-		$backend_type = $frontend['type'];
-		$httpchk = "httpchk";
-	}
-
-	fwrite ($fd, "\tmode\t\t\t" . $backend_type . "\n");
-
-	if($frontend['balance'])
-		fwrite ($fd, "\tbalance\t\t\t" . $frontend['balance'] . "\n");
-
-	if($frontend['connection_timeout'])
-		fwrite ($fd, "\tcontimeout\t\t" . $frontend['connection_timeout'] . "\n");
-
-	if($frontend['server_timeout'])
-		fwrite ($fd, "\tsrvtimeout\t\t" . $frontend['server_timeout'] . "\n");
-
-	if($frontend['retries'])
-		fwrite ($fd, "\tretries\t\t\t" . $frontend['retries'] . "\n");
-
-	if($frontend['stats_enabled']=='yes') {
-		fwrite ($fd, "\tstats\t\t\tenable\n");
-		if($frontend['stats_uri'])
-			fwrite ($fd, "\tstats\t\t\turi ".$frontend['stats_uri']."\n");
-		if($frontend['stats_realm'])
-			fwrite ($fd, "\tstats\t\t\trealm " . $frontend['stats_realm'] . "\n");
-		else 
-			fwrite ($fd, "\tstats\t\t\trealm .\n");
-		fwrite ($fd, "\tstats\t\t\tauth " . $frontend['stats_username'].":". $frontend['stats_password']."\n");
-	}
-
-	$uri = $pool['monitor_uri'];
-	if ($pool['monitor_uri'])
-		$uri = $pool['monitor_uri'];
-	else
-		$uri = "/";
-	fwrite ($fd, "\toption\t\t\t{$httpchk} HEAD " . $uri . " HTTP/1.0\n");
-
-	if($pool['cookie']  && strtolower($frontend['type']) == "http") 
-		$cookie = " cookie {$pool['cookie']} ";
-	else 
-		$cookie = "";
-	if($pool['advanced']) {
-		$advanced = base64_decode($pool['advanced']);
-		$advanced_txt = " " . $advanced;
-	} else {
-		$advanced_txt = "";
-	}
-	if($pool['checkinter']) 
-		$checkinter = "check inter {$pool['checkinter']}";
-	else if (strtolower($frontend['type']) != "tcp")
-		$checkinter = "check inter 1000";
-	else
-		$checkinter = "";
-
-	$a_servers = &$pool['ha_servers']['item'];
-	foreach($a_servers as $be) {
-		if(!$be['port']) {
-			// the listener can specify a default port
-			$be['port'] = $frontend['svrport'];
-		}
-		if(!$be['port']) {
-			// last resort, use the frontend port
-			$ports = split(",", "{$frontend['port']},");
-			$be['port'] = $ports[0];
-		}
-		if (!$be['name'])
-			$be['name'] = $be['address'];
-		if($be['backup']) {
-			$isbackup = "backup";
-		} else {
-			$isbackup = "";
-		}
-		fwrite ($fd, "\tserver\t\t\t" . $be['name'] . " " . $be['address'].":" . $be['port'] . " $cookie " . " $checkinter $isbackup weight " . $be['weight'] . "{$advanced_txt}\n");
-	}
-	fwrite ($fd, "\n");
-}
-
-function haproxy_configure() {
-	// reload haproxy
-	haproxy_writeconf();
-	return haproxy_check_run(1);
-}
-
-function haproxy_writeconf() {
-	global $config, $g;
-
-	$a_global = &$config['installedpackages']['haproxy'];
-	$a_backends = &$config['installedpackages']['haproxy']['ha_backends']['item'];
-	$a_pools = &$config['installedpackages']['haproxy']['ha_pools']['item'];
-
-	$fd = fopen("{$g['varetc_path']}/haproxy.cfg", "w");
-
-	if(is_array($a_global)) {
-		fwrite ($fd, "global\n");
-		if($a_global['advanced'])
-			fwrite ($fd, "\t" . base64_decode($a_global['advanced']) . "\n");
-		fwrite ($fd, "\tmaxconn\t\t\t".$a_global['maxconn']."\n");
-		if($a_global['remotesyslog'])
-			fwrite ($fd, "\tlog\t\t\t{$a_global['remotesyslog']}\t{$a_global['logfacility']}\t{$a_global['loglevel']}\n");
-		fwrite ($fd, "\tuid\t\t\t80\n");
-		fwrite ($fd, "\tgid\t\t\t80\n");
-		// Set numprocs if defined or use system default (#cores)
-		if($a_global['nbproc'])
-			$numprocs = $a_global['nbproc'];
-		else 
-			$numprocs = trim(`/sbin/sysctl kern.smp.cpus | cut -d" " -f2`);			
-		fwrite ($fd, "\tnbproc\t\t\t$numprocs\n");
-		fwrite ($fd, "\tchroot\t\t\t/var/empty\n");
-		fwrite ($fd, "\tdaemon\n");
-		fwrite ($fd, "\n");
-	}
-
-	// Try and get a unique array for address:port as frontends can duplicate
-	$a_bind = array();
-	if(is_array($a_backends)) {
-		foreach ($a_backends as $backend) {
-			if($backend['status'] != 'active')
-				continue;
-			if(!$backend['pool'])
-				continue;
-
-			$bname = $backend['extaddr'] . ":" . $backend['port'];
-			if (!is_array($a_bind[$bname])) {
-				$a_bind[$bname] = array();
-				$a_bind[$bname]['config'] = array();
-				// Settings which are constant for a merged frontend
-				$a_bind[$bname]['name'] = $backend['name'];
-				$a_bind[$bname]['extaddr'] = $backend['extaddr'];
-				$a_bind[$bname]['port'] = $backend['port'];
-			}
-			$b = &$a_bind[$bname];
-			
-			// Overwrite ?
-			$b['type'] = $backend['type'];
-			$b['forwardfor'] = $backend['forwardfor'];
-			$b['httpclose'] = $backend['httpclose'];
-			$b['max_connections'] = $backend['max_connections'];
-			$b['client_timeout'] = $backend['client_timeout'];
-			$b['advanced'] = $backend['advanced'];
-
-			// pointer to each backend 
-			$b['config'][] = $backend;
-		}
-	}
-	
-	$a_pendingpl = array();
-
-	// Construct and write out configuration file
-	if(is_array($a_bind)) {
-		foreach ($a_bind as $bind) {
-			if (count($bind['config']) > 1)
-				$frontendinfo = "frontend {$bind['name']}-merged\n";
-			else
-				$frontendinfo = "frontend {$bind['name']}\n";
-
-			// Prepare ports for processing by splitting
-			$portss = "{$bind['port']},";
-			$ports = split(",", $portss);
-			
-			// Initialize variable
-			$listenip = "";
-			
-			// Process and add bind directives for ports
-			foreach($ports as $port) {
-				if($port) {
-					if($bind['extaddr'] == "any") 
-						$listenip .=  "\tbind\t\t\t0.0.0.0:{$port}\n";
-					elseif($bind['extaddr']) 
-						$listenip .=  "\tbind\t\t\t{$bind['extaddr']}:{$port}\n";				
-					else 
-						$listenip .= "\tbind\t\t\t" . get_current_wan_address('wan') . ":{$port}\n";
-				}
-			}
-			
-			fwrite ($fd, "{$frontendinfo}");
-			fwrite ($fd, "{$listenip}");
-
-			// Advanced pass thru
-			if($bind['advanced']) {
-				$advanced = base64_decode($bind['advanced']);
-				fwrite($fd, "\t" . $advanced . "\n");
-			}
-			
-			// https is an alias for tcp for clarity purpouses
-			if(strtolower($bind['type']) == "https") {
-				$backend_type = "tcp";
-				$httpchk = "ssl-hello-chk";
-			} else { 
-				$backend_type = $bind['type'];
-				$httpchk = "httpchk";
-			}
-
-			fwrite ($fd, "\tmode\t\t\t" . $backend_type . "\n");
-			fwrite ($fd, "\tlog\t\t\tglobal\n");
-			fwrite ($fd, "\toption\t\t\tdontlognull\n");
-
-			if($bind['httpclose']) 
-				fwrite ($fd, "\toption\t\t\thttpclose\n");
-
-			if($bind['forwardfor']) 
-				fwrite ($fd, "\toption\t\t\tforwardfor\n");
-
-			if($bind['max_connections'])
-				fwrite ($fd, "\tmaxconn\t\t\t" . $bind['max_connections'] . "\n");
-
-			if($bind['client_timeout'])
-				fwrite ($fd, "\tclitimeout\t\t" . $bind['client_timeout'] . "\n");
-
-	
-			// Combine the rest of the listener configs
-			$default_once = 0;
-			$i = 0;
-			foreach ($bind['config'] as $bconfig) {
-				$a_acl=&$bconfig['ha_acls']['item'];
-				if(!is_array($a_acl)) 
-					$a_acl=array();
-			
-				$poolname = $bconfig['pool'] . "_" . strtolower($bconfig['type']);
-
-				// Create different pools if the svrport is set
-				if ($bconfig['svrport'] > 0)
-					$poolname .= "_" . $bconfig['svrport'];
-
-				// Write this out once, and must be before any backend config text
-				if ($default_once == 0) {
-					fwrite ($fd, "\tdefault_backend\t\t" . $poolname . "\n");
-					$default_once++;
-				}
-
-				if (!isset($a_pendingpl[$poolname])) {
-					$a_pendingpl[$poolname] = array();
-					$a_pendingpl[$poolname]['name'] = $poolname;
-					$a_pendingpl[$poolname]['frontend'] = $bconfig;
-				}
-
-				foreach ($a_acl as $entry) {
-					$acl = haproxy_find_acl($entry['expression']);
-					if (!$acl)
-						continue;
-
-					// Filter out acls for different modes
-					if ($acl['mode'] != '' && $acl['mode'] != strtolower($bind['type']))
-						continue;
-
-					if ($acl['syntax'] != '')
-						$expr = $acl['syntax'] . " " . $entry['value'];
-					else
-						$expr = $entry['expression'] . " " . $entry['value'];
-
-					$aclname = $i . "_" . $entry['name'];
-					fwrite ($fd, "\tacl\t\t\t" . $aclname . "\t" . $expr . "\n");
-					fwrite ($fd, "\tuse_backend\t\t" . $poolname . " if " . $aclname . "\n");
-					$i++;
-				}
-
-			}
-			fwrite ($fd, "\n");
-		}
-	}
-	if (is_array($a_pendingpl) && is_array($a_pools)) {
-		foreach ($a_pendingpl as $pending) {
-			foreach ($a_pools as $pool) {
-				if ($pending['frontend']['pool'] == $pool['name']) {
-					write_backend($fd, $pending['name'], $pool, $pending['frontend']);
-				}
-			}
-		}
-	}
-	fwrite ($fd, "\n");
-
-	// Sync HAProxy configuration (if enabled)
-	if(isset($config['installedpackages']['haproxy']['enablesync'])) {
-		if($config['installedpackages']['haproxy']['synchost1']) {
-			haproxy_do_xmlrpc_sync($config['installedpackages']['haproxy']['synchost1'], 
-				$config['installedpackages']['haproxy']['syncpassword']);
-		}
-		if($config['installedpackages']['haproxy']['synchost2']) {
-			haproxy_do_xmlrpc_sync($config['installedpackages']['haproxy']['synchost2'], 
-				$config['installedpackages']['haproxy']['syncpassword']);
-		}
-		if($config['installedpackages']['haproxy']['synchost3']) {
-			haproxy_do_xmlrpc_sync($config['installedpackages']['haproxy']['synchost3'], 
-				$config['installedpackages']['haproxy']['syncpassword']);				
-		}
-	}
-
-	// create config file
-	fclose($fd);
-
-	if (isset($a_global['carpdev']))
-		haproxy_install_cron(true);
-	else
-		haproxy_install_cron(false);
-
-	$freebsd_version = substr(trim(`uname -r`), 0, 1);
-	if(!file_exists("/usr/bin/limits")) {
-		exec("fetch -q -o /usr/bin/limits http://files.pfsense.org/extras/{$freebsd_version}/limits");
-		exec("chmod a+rx /usr/bin/limits");
-	}
-}
-
-function haproxy_is_running() {
-        $running = (shell_exec("/bin/pgrep -x haproxy") != '');
-        return $running;
-}
-
-function haproxy_check_run($reload) {
-	global $config, $g;
-
-	$a_global = &$config['installedpackages']['haproxy'];
-
-	exec("/usr/bin/limits -n 300014");
-
-	if(isset($a_global['enable'])) {
-		if (isset($a_global['carpdev'])) {
-			$status = get_carp_interface_status($a_global['carpdev']);
-			if ($status != "MASTER") {
-				if (haproxy_is_running()) {
-					log_error("Stopping haproxy on CARP backup.");
-					exec("/bin/pkill -F /var/run/haproxy.pid haproxy");
-				}
-				return (0);
-			} else if (haproxy_is_running() && $reload == 0) { 
-				return (0);
-			}
-			log_error("Starting haproxy on CARP master.");
-			/* fallthrough */
-		} else if ($reload == 0)
-			return (0);
-
-		if (haproxy_is_running()) {
-			exec("/usr/local/sbin/haproxy -f /var/etc/haproxy.cfg -p /var/run/haproxy.pid -st `cat /var/run/haproxy.pid`");
-		} else {
-			exec("/usr/local/sbin/haproxy -f /var/etc/haproxy.cfg -p /var/run/haproxy.pid -D");
-		}
-		return (0);
-	} else {
-		if ($reload && haproxy_is_running()) {
-			exec("/bin/pkill -F /var/run/haproxy.pid haproxy");
-		}
-		return (1);
-	}
-	
-}
-
-function haproxy_do_xmlrpc_sync($sync_to_ip, $password) {
-	global $config, $g;
-
-	if(!$password)
-		return;
-
-	if(!$sync_to_ip)
-		return;
-	
-	// Do not allow syncing to self.
-	$donotsync = false;
-	$lanip = find_interface_ip($config['interfaces']['lan']['if']);
-	if($lanip == $sync_to_ip) 
-		$donotsync = true;
-	$wanip = find_interface_ip($config['interfaces']['wan']['if']);
-	if($wanip == $sync_to_ip) 
-		$donotsync = true;
-	for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
-		$optip = find_interface_ip($config['interfaces']['opt' . $j]['if']);
-		if($optip == $sync_to_ip) 
-		$donotsync = true;
-	}
-	if($donotsync) {
-		log_error("Disallowing sync loop for HAProxy sync.");
-		return;
-	}
-
-	$xmlrpc_sync_neighbor = $sync_to_ip;
-    if($config['system']['webgui']['protocol'] != "") {
-		$synchronizetoip = $config['system']['webgui']['protocol'];
-		$synchronizetoip .= "://";
-    }
-    $port = $config['system']['webgui']['port'];
-    /* if port is empty lets rely on the protocol selection */
-    if($port == "") {
-		if($config['system']['webgui']['protocol'] == "http") 
-			$port = "80";
-		else 
-			$port = "443";
-    }
-	$synchronizetoip .= $sync_to_ip;
-
-	/* xml will hold the sections to sync */
-	$xml = array();
-	$xml['haproxy'] = $config['installedpackages']['haproxy'];
-
-	// Prevent sync loops
-	unset($xml['synchost1']);
-	unset($xml['synchost2']);
-	unset($xml['synchost3']);
-	unset($xml['syncpassword']);
-
-	/* assemble xmlrpc payload */
-	$params = array(
-		XML_RPC_encode($password),
-		XML_RPC_encode($xml)
-	);
-
-	/* set a few variables needed for sync code borrowed from filter.inc */
-	$url = $synchronizetoip;
-	log_error("Beginning HAProxy XMLRPC sync to {$url}:{$port}.");
-	$method = 'pfsense.merge_installedpackages_section_xmlrpc';
-	$msg = new XML_RPC_Message($method, $params);
-	$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
-	$cli->setCredentials('admin', $password);
-	if($g['debug'])
-		$cli->setDebug(1);
-	/* send our XMLRPC message and timeout after 250 seconds */
-	$resp = $cli->send($msg, "250");
-	if(!$resp) {
-		$error = "A communications error occurred while attempting HAProxy XMLRPC sync with {$url}:{$port}.";
-		log_error($error);
-		file_notice("sync_settings", $error, "HAProxy Settings Sync", "");
-	} elseif($resp->faultCode()) {
-		$cli->setDebug(1);
-		$resp = $cli->send($msg, "250");
-		$error = "An error code was received while attempting HAProxy XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
-		log_error($error);
-		file_notice("sync_settings", $error, "HAProxy Settings Sync", "");
-	} else {
-		log_error("HAProxy XMLRPC sync successfully completed with {$url}:{$port}.");
-	}
-
-	/* tell haproxy to reload our settings on the destionation sync host. */
-	$method = 'pfsense.exec_php';
-	$execcmd  = "require_once('/usr/local/pkg/haproxy.inc');\n";
-	$execcmd .= "haproxy_configure();\n";
-	
-	/* assemble xmlrpc payload */
-	$params = array(
-		XML_RPC_encode($password),
-		XML_RPC_encode($execcmd)
-	);
-
-	log_error("HAProxy XMLRPC reload data {$url}:{$port}.");
-	$msg = new XML_RPC_Message($method, $params);
-	$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
-	$cli->setCredentials('admin', $password);
-	$resp = $cli->send($msg, "250");
-	if(!$resp) {
-		$error = "A communications error occurred while attempting HAProxy XMLRPC sync with {$url}:{$port} (pfsense.exec_php).";
-		log_error($error);
-		file_notice("sync_settings", $error, "HAProxy Settings Reload", "");
-	} elseif($resp->faultCode()) {
-		$cli->setDebug(1);
-		$resp = $cli->send($msg, "250");
-		$error = "An error code was received while attempting HAProxy XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
-		log_error($error);
-		file_notice("sync_settings", $error, "HAProxy Settings Sync", "");
-	} else {
-		log_error("HAProxy XMLRPC reload data success with {$url}:{$port} (pfsense.exec_php).");
-	}
-}
-
-?>
diff --git a/config/haproxy-dev/haproxy.xml b/config/haproxy-dev/haproxy.xml
deleted file mode 100644
index 83e2ca5d..00000000
--- a/config/haproxy-dev/haproxy.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
-<packagegui>
-        <copyright>
-        <![CDATA[
-/* $Id$ */
-/* ========================================================================== */
-/*
-    haproxy.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2009 Scott Ullrich
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
-/*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
-	<name>haproxy</name>
-	<version>1.0</version>
-	<title>HAProxy</title>
-	<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_listeners.php</url>
-	</menu>
-	<service>
-		<name>HAProxy</name>
-		<rcfile>haproxy.sh</rcfile>
-		<executable>haproxy</executable>
-		<description>The Reliable, High Performance TCP/HTTP Load Balancer</description>
-	</service>	
-	<configpath>installedpackages->haproxy->config</configpath>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<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-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-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-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-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-dev/haproxy_pool_edit.php</item>
-	</additional_files_needed>
-	<custom_delete_php_command>
-	</custom_delete_php_command>
-	<custom_add_php_command>
-	</custom_add_php_command>
-	<custom_php_resync_config_command>
-	</custom_php_resync_config_command>
-	<custom_php_install_command>
-		$freebsdv=trim(`uname -r | cut -d'.' -f1`);
-		conf_mount_rw();
-		`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>
-</packagegui>
diff --git a/config/haproxy-dev/haproxy_global.php b/config/haproxy-dev/haproxy_global.php
deleted file mode 100755
index 1ef28005..00000000
--- a/config/haproxy-dev/haproxy_global.php
+++ /dev/null
@@ -1,412 +0,0 @@
-<?php
-/* $Id: load_balancer_pool.php,v 1.5.2.6 2007/03/02 23:48:32 smos Exp $ */
-/*
-	haproxy_global.php
-	part of pfSense (http://www.pfsense.com/)
-	Copyright (C) 2009 Scott Ullrich <sullrich@pfsense.com>
-	Copyright (C) 2008 Remco Hoef <remcoverhoef@pfsense.com>
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require("globals.inc");
-require("guiconfig.inc");
-require_once("haproxy.inc");
-
-$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty";
-
-if (!is_array($config['installedpackages']['haproxy'])) 
-	$config['installedpackages']['haproxy'] = array();
-
-
-if ($_POST) {
-	unset($input_errors);
-	$pconfig = $_POST;
-	
-	if ($_POST['apply']) {
-		$retval = 0;
-		config_lock();
-		$retval = haproxy_configure();
-		config_unlock();
-		$savemsg = get_std_save_message($retval);
-		unlink_if_exists($d_haproxyconfdirty_path);
-	} else {
-		if ($_POST['enable']) {
-			$reqdfields = explode(" ", "maxconn");
-			$reqdfieldsn = explode(",", "Maximum connections");		
-		}
-
-		if ($_POST['carpdev'] == "disabled")
-			unset($_POST['carpdev']);
-
-		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
-
-		if ($_POST['maxconn'] && (!is_numeric($_POST['maxconn']))) 
-			$input_errors[] = "The maximum number of connections should be numeric.";
-
-		if($_POST['synchost1'] && !is_ipaddr($_POST['synchost1']))
-			$input_errors[] = "Synchost1 needs to be an IPAddress.";
-		if($_POST['synchost2'] && !is_ipaddr($_POST['synchost2']))
-			$input_errors[] = "Synchost2 needs to be an IPAddress.";
-		if($_POST['synchost3'] && !is_ipaddr($_POST['synchost3']))
-			$input_errors[] = "Synchost3 needs to be an IPAddress.";
-
-		if (!$input_errors) {
-			$config['installedpackages']['haproxy']['enable'] = $_POST['enable'] ? true : false;
-			$config['installedpackages']['haproxy']['maxconn'] = $_POST['maxconn'] ? $_POST['maxconn'] : false;
-			$config['installedpackages']['haproxy']['enablesync'] = $_POST['enablesync'] ? true : false;
-			$config['installedpackages']['haproxy']['synchost1'] = $_POST['synchost1'] ? $_POST['synchost1'] : false;
-			$config['installedpackages']['haproxy']['synchost2'] = $_POST['synchost2'] ? $_POST['synchost2'] : false;
-			$config['installedpackages']['haproxy']['synchost2'] = $_POST['synchost3'] ? $_POST['synchost3'] : false;
-			$config['installedpackages']['haproxy']['remotesyslog'] = $_POST['remotesyslog'] ? $_POST['remotesyslog'] : false;
-			$config['installedpackages']['haproxy']['logfacility'] = $_POST['logfacility'] ? $_POST['logfacility'] : false;
-			$config['installedpackages']['haproxy']['loglevel'] = $_POST['loglevel'] ? $_POST['loglevel'] : false;
-			$config['installedpackages']['haproxy']['carpdev'] = $_POST['carpdev'] ? $_POST['carpdev'] : false;
-			$config['installedpackages']['haproxy']['syncpassword'] = $_POST['syncpassword'] ? $_POST['syncpassword'] : false;
-			$config['installedpackages']['haproxy']['advanced'] = base64_encode($_POST['advanced']) ? $_POST['advanced'] : false;
-			$config['installedpackages']['haproxy']['nbproc'] = $_POST['nbproc'] ? $_POST['nbproc'] : false;			
-			touch($d_haproxyconfdirty_path);
-			write_config();
-		}
-	}
-	
-}
-
-$pconfig['enable'] = isset($config['installedpackages']['haproxy']['enable']);
-$pconfig['maxconn'] = $config['installedpackages']['haproxy']['maxconn'];
-$pconfig['enablesync'] = isset($config['installedpackages']['haproxy']['enablesync']);
-$pconfig['syncpassword'] = $config['installedpackages']['haproxy']['syncpassword'];
-$pconfig['synchost1'] = $config['installedpackages']['haproxy']['synchost1'];
-$pconfig['synchost2'] = $config['installedpackages']['haproxy']['synchost2'];
-$pconfig['synchost3'] = $config['installedpackages']['haproxy']['synchost3'];
-$pconfig['remotesyslog'] = $config['installedpackages']['haproxy']['remotesyslog'];
-$pconfig['logfacility'] = $config['installedpackages']['haproxy']['logfacility'];
-$pconfig['loglevel'] = $config['installedpackages']['haproxy']['loglevel'];
-$pconfig['carpdev'] = $config['installedpackages']['haproxy']['carpdev'];
-$pconfig['advanced'] = base64_decode($config['installedpackages']['haproxy']['advanced']);
-$pconfig['nbproc'] = $config['installedpackages']['haproxy']['nbproc'];
-
-// defaults
-if (!$pconfig['logfacility'])
-	$pconfig['logfacility'] = 'local0';
-if (!$pconfig['loglevel'])
-	$pconfig['loglevel'] = 'info';
-
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
-	$one_two = true;
-
-$pgtitle = "Services: HAProxy: Settings";
-include("head.inc");
-
-?>
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<script type="text/javascript" src="javascript/scriptaculous/prototype.js"></script>
-<script type="text/javascript" src="javascript/scriptaculous/scriptaculous.js"></script>
-<?php include("fbegin.inc"); ?>
-<script language="JavaScript">
-<!--
-function enable_change(enable_change) {
-	var endis;
-	endis = !(document.iform.enable.checked || enable_change);
-	document.iform.maxconn.disabled = endis;
-}
-//-->
-</script>
-<?php if($one_two): ?>
-<p class="pgtitle"><?=$pgtitle?></p>
-<?php endif; ?>
-<form action="haproxy_global.php" method="post" name="iform">
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (file_exists($d_haproxyconfdirty_path)): ?><p>
-<?php print_info_box_np("The load balancer configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
-<?php endif; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr><td class="tabnavtbl">
-	<?php
-	/* active tabs */
-	$tab_array = array();
-	$tab_array[] = array("Settings", true, "haproxy_global.php");
-	$tab_array[] = array("Listener", false, "haproxy_listeners.php");	
-	$tab_array[] = array("Server Pool", false, "haproxy_pools.php");	
-	display_top_tabs($tab_array);
-	?>
-	</td></tr>
-	<tr>
-	<td>
-	<div id="mainarea">
-		<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
-			<tr>
-				<td colspan="2" valign="top" class="listtopic">General settings</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell">&nbsp;</td>
-				<td width="78%" class="vtable">
-				<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)">
-				<strong>Enable HAProxy</strong></td>
-			</tr>
-			<tr>
-				<td valign="top" class="vncell">
-					Maximum connections
-				</td>
-				<td class="vtable">
-					<table><tr><td>
-					<table cellpadding="0" cellspacing="0">
-						<tr>
-							<td>
-								<input name="maxconn" type="text" class="formfld" id="maxconn" size="5" <?if ($pconfig['enable']!='yes') echo "enabled=\"false\"";?>  value="<?=htmlspecialchars($pconfig['maxconn']);?>"> per Backend.
-							</td>
-						</tr>
-					</table>
-					Sets the maximum per-process number of concurrent connections to X.<br/>
-					<strong>NOTE:</strong> setting this value too high will result in HAProxy not being able to allocate enough memory.<br/>
-				<?php
-					$hascpu = trim(`top | grep haproxy | awk '{ print $6 }'`);
-					if($hascpu)
-						echo "<p>Current memory usage {$hascpu}.</p>";
-				?>
-					</td><td>
-					<table style="border: 1px solid #000;">
-						<tr>
-							<td><font size=-1>Connections</td>
-							<td><font size=-1>Memory usage</td>
-						</tr>
-						<tr>
-							<td colspan="2">
-								<hr noshade style="border: 1px solid #000;">
-							</td>
-						</tr>
-						<tr>
-							<td align="right"><font size=-1>999</td>
-							<td><font size=-1>1888K</td>
-						</tr>
-						<tr>
-							<td align="right"><font size=-1>99999</td>
-							<td><font size=-1>8032K</td>
-						</tr>
-						<tr>
-							<td align="right"><font size=-1>999999</td>
-							<td><font size=-1>50016K</td>
-						</tr>
-						<tr>
-							<td align="right"><font size=-1>9999999</td>
-							<td><font size=-1>467M</td>
-						</tr>
-					</table>
-					</td></tr></table>
-				</td>
-			</tr>
-			<tr>
-				<td valign="top" class="vncell">
-					Number of processes to start
-				</td>
-				<td class="vtable">
-					<input name="nbproc" type="text" class="formfld" id="nbproc" size="18" value="<?=htmlspecialchars($pconfig['nbproc']);?>">
-					<br/>
-					Defaults to number of cores/processors installed if left blank (<?php echo trim(`/sbin/sysctl kern.smp.cpus | cut -d" " -f2`); ?> detected).
-				</td>
-			</tr>
-			<tr>
-				<td valign="top" class="vncell">
-					Remote syslog host
-				</td>
-				<td class="vtable">
-					<input name="remotesyslog" type="text" class="formfld" id="remotesyslog" size="18" value="<?=htmlspecialchars($pconfig['remotesyslog']);?>">
-				</td>
-			</tr>
-			<tr>
-				<td valign="top" class="vncell">
-					Syslog facility
-				</td>
-				<td class="vtable">
-					<select name="logfacility" class="formfld">
-				<?php
-					$facilities = array("kern", "user", "mail", "daemon", "auth", "syslog", "lpr",
-						"news", "uucp", "cron", "auth2", "ftp", "ntp", "audit", "alert", "cron2",
-					       	"local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7");
-					foreach ($facilities as $f): 
-				?>
-					<option value="<?=$f;?>" <?php if ($f == $pconfig['logfacility']) echo "selected"; ?>>
-						<?=$f;?>
-					</option>
-				<?php
-					endforeach;
-				?>
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td valign="top" class="vncell">
-					Syslog level
-				</td>
-				<td class="vtable">
-					<select name="loglevel" class="formfld">
-				<?php
-					$levels = array("emerg", "alert", "crit", "err", "warning", "notice", "info", "debug");
-					foreach ($levels as $l): 
-				?>
-					<option value="<?=$l;?>" <?php if ($l == $pconfig['loglevel']) echo "selected"; ?>>
-						<?=$l;?>
-					</option>
-				<?php
-					endforeach;
-				?>
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td valign="top" class="vncell">
-					Carp monitor
-				</td>
-				<td class="vtable">
-					<select name="carpdev" class="formfld">
-					<option value="disabled" <?php if (!isset($pconfig['carpdev'])) echo "selected"; ?>>
-						disabled
-					</option>
-				<?php
-					if(is_array($config['virtualip']['vip'])) {
-					foreach($config['virtualip']['vip'] as $carp):
-						if ($carp['mode'] != "carp") continue;
-						$ipaddress = $carp['subnet'];
-						$carp_int = find_carp_interface($ipaddress);
-				?>
-					<option value="<?=$carp_int;?>"
-					 <?php if (isset($pconfig['carpdev']) && $carp_int == $pconfig['carpdev']) echo "selected"; ?>>
-						<?=$carp_int;?> (<?=$ipaddress;?>)
-					</option>
-				<?php
-					endforeach;
-					}
-				?>
-					</select>
-					<br/>
-					Monitor carp interface and only run haproxy on the firewall which is MASTER.
-				</td>
-			</tr>
-			<tr>
-				<td>
-					&nbsp;
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2" valign="top" class="listtopic">Global Advanced pass thru</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell">&nbsp;</td>
-				<td width="78%" class="vtable">
-					<textarea name='advanced' rows="4" cols="70" id='advanced'><?php echo $pconfig['advanced']; ?></textarea>
-					<br/>
-					NOTE: paste text into this box that you would like to pass thru in the global settings area.
-				</td>
-			</tr>
-			<tr>
-				<td>
-					&nbsp;
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2" valign="top" class="listtopic">Configuration synchronization</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell">&nbsp;</td>
-				<td width="78%" class="vtable">
-					<input name="enablesync" type="checkbox" value="yes" <?php if ($pconfig['enablesync']) echo "checked"; ?>>
-					<strong>Sync HAProxy configuration to backup CARP members via XMLRPC.</strong>
-				</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell">Synchronization password</td>
-				<td width="78%" class="vtable">
-					<input name="syncpassword" type="password" value="<?=$pconfig['syncpassword'];?>">
-					<br/>
-					<strong>Enter the password that will be used during configuration synchronization.  This is generally the remote webConfigurator password.</strong>
-				</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell">Sync host #1</td>
-				<td width="78%" class="vtable">
-					<input name="synchost1" value="<?=$pconfig['synchost1'];?>">
-					<br/>
-					<strong>Synchronize settings to this hosts IP address.</strong>
-				</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell">Sync host #2</td>
-				<td width="78%" class="vtable">
-					<input name="synchost2" value="<?=$pconfig['synchost2'];?>">
-					<br/>
-					<strong>Synchronize settings to this hosts IP address.</strong>
-				</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top" class="vncell">Sync host #3</td>
-				<td width="78%" class="vtable">
-					<input name="synchost3" value="<?=$pconfig['synchost3'];?>">
-					<br/>
-					<strong>Synchronize settings to this hosts IP address.</strong>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					&nbsp;
-				</td>
-			</tr>
-			<tr>
-				<td width="22%" valign="top">&nbsp;</td>
-					<td width="78%">
-						<input name="Submit" type="submit" class="formbtn" value="Save" onClick="enable_change(true)">
-					</td>
-				</td>
-			</tr>
-		</table>
-	</div>
-</table>
-
-<?php if(file_exists("/var/etc/haproxy.cfg")): ?>
-	<p/>
-	<div id="configuration" style="display:none; border-style:dashed; padding: 8px;">
-		<b><i>/var/etc/haproxy.cfg file contents:</b></i>
-		<?php
-			if(file_exists("/var/etc/haproxy.cfg")) {
-				echo "<pre>" . trim(file_get_contents("/var/etc/haproxy.cfg")) . "</pre>";
-			}
-		?>
-	</div>
-	<div id="showconfiguration">
-		<a onClick="new Effect.Fade('showconfiguration'); new Effect.Appear('configuration');  setTimeout('scroll_after_fade();', 250); return false;" href="#">Show</a> automatically generated configuration.
-	</div>
-<?php endif; ?>
-
-</form>
-<script language="JavaScript">
-	function scroll_after_fade() {
-		scrollTo(0,99999999999);
-	}
-<!--
-enable_change(false);
-//-->
-</script>
-<?php include("fend.inc"); ?>
-</body>
-</html>
diff --git a/config/haproxy-dev/haproxy_listeners.php b/config/haproxy-dev/haproxy_listeners.php
deleted file mode 100755
index ef67108b..00000000
--- a/config/haproxy-dev/haproxy_listeners.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/* $Id: load_balancer_virtual_server.php,v 1.6.2.1 2006/01/02 23:46:24 sullrich Exp $ */
-/*
-	haproxy_baclkends.php
-	part of pfSense (http://www.pfsense.com/)
-	Copyright (C) 2009 Scott Ullrich <sullrich@pfsense.com>
-	Copyright (C) 2008 Remco Hoef <remcoverhoef@pfsense.com>
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once("guiconfig.inc");
-
-$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty";
-
-require_once("haproxy.inc");
-
-if (!is_array($config['installedpackages']['haproxy']['ha_backends']['item'])) {
-	$config['installedpackages']['haproxy']['ha_backends']['item'] = array();
-}
-$a_backend = &$config['installedpackages']['haproxy']['ha_backends']['item'];
-
-if ($_POST) {
-	$pconfig = $_POST;
-
-	if ($_POST['apply']) {
-		$retval = 0;
-		config_lock();
-		$retval = haproxy_configure();
-		config_unlock();
-		$savemsg = get_std_save_message($retval);
-		unlink_if_exists($d_haproxyconfdirty_path);
-	}
-}
-
-if ($_GET['act'] == "del") {
-	if (isset($a_backend[$_GET['id']])) {
-		if (!$input_errors) {
-			unset($a_backend[$_GET['id']]);
-			write_config();
-			touch($d_haproxyconfdirty_path);
-		}
-		header("Location: haproxy_listeners.php");
-		exit;
-	}
-}
-
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
-	$one_two = true;
-	
-$pgtitle = "Services: HAProxy: Listener";
-include("head.inc");
-
-?>
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<form action="haproxy_listeners.php" method="post">
-<?php if($one_two): ?>
-<p class="pgtitle"><?=$pgtitle?></p>
-<?php endif; ?>
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (file_exists($d_haproxyconfdirty_path)): ?><p>
-<?php print_info_box_np("The virtual server configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
-<?php endif; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td class="tabnavtbl">
-  <?php
-        /* active tabs */
-        $tab_array = array();
-	$tab_array[] = array("Settings", false, "haproxy_global.php");
-        $tab_array[] = array("Listener", true, "haproxy_listeners.php");		
-	$tab_array[] = array("Server Pool", false, "haproxy_pools.php");
-	display_top_tabs($tab_array);
-  ?>
-  </td></tr>
-  <tr>
-    <td>
-	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                  <td width="20%" class="listhdrr">Name</td>
-                  <td width="30%" class="listhdrr">Description</td>
-                  <td width="20%" class="listhdrr">Address</td>
-                  <td width="10%" class="listhdrr">Type</td>
-                  <td width="10%" class="listhdrr">Server&nbsp;pool</td>
-                  <td width="5%" class="list"></td>
-		</tr>
-<?php
-		$i = 0;
-		foreach ($a_backend as $backend):
-		$textss = $textse = "";
-		if ($backend['status'] != 'active') {
-			$textss = "<span class=\"gray\">";
-			$textse = "</span>";
-		}
-?>
-                <tr>
-                  <td class="listlr" ondblclick="document.location='haproxy_listeners_edit.php?id=<?=$i;?>';">
-					<?=$textss . $backend['name'] . $textse;?>
-                  </td>
-                  <td class="listlr" ondblclick="document.location='haproxy_listeners_edit.php?id=<?=$i;?>';">
-					<?=$textss . $backend['desc'] . $textse;?>
-                  </td>
-                  <td class="listlr" ondblclick="document.location='haproxy_listeners_edit.php?id=<?=$i;?>';">
-<?php
-			echo $textss;
-			if($backend['extaddr'] == "any") 
-				echo "0.0.0.0";
-			elseif($backend['extaddr']) 
-				echo $backend['extaddr'];
-			else 
-				echo get_current_wan_address('wan');
-			echo ":" . $backend['port'];
-			echo $textse;
-?>
-                  </td>
-                  <td class="listlr" ondblclick="document.location='haproxy_listeners_edit.php?id=<?=$i;?>';">
-					<?=$textss . $backend['type'] . $textse;?>
-                  </td>
-                  <td class="listlr" ondblclick="document.location='haproxy_listeners_edit.php?id=<?=$i;?>';">
-					<?=$textss . $backend['pool'] . $textse;?>
-                  </td>
-                  <td class="list" nowrap>
-                    <table border="0" cellspacing="0" cellpadding="1">
-                      <tr>
-                        <td valign="middle"><a href="haproxy_listeners_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-                        <td valign="middle"><a href="haproxy_listeners.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this entry?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
-                        <td valign="middle"><a href="haproxy_listeners_edit.php?dup=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <?php $i++; endforeach; ?>
-                <tr>
-                  <td class="list" colspan="5"></td>
-                  <td class="list">
-                    <table border="0" cellspacing="0" cellpadding="1">
-                      <tr>
-                        <td valign="middle"><a href="haproxy_listeners_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-              </table>
-	   </div>
-	</table>
-            </form>
-<?php include("fend.inc"); ?>
-</body>
-</html>
diff --git a/config/haproxy-dev/haproxy_listeners_edit.php b/config/haproxy-dev/haproxy_listeners_edit.php
deleted file mode 100755
index 22be121b..00000000
--- a/config/haproxy-dev/haproxy_listeners_edit.php
+++ /dev/null
@@ -1,771 +0,0 @@
-<?php
-/* $Id: load_balancer_pool_edit.php,v 1.24.2.23 2007/03/03 00:07:09 smos Exp $ */
-/*
-	haproxy_listeners_edit.php
-	part of pfSense (http://www.pfsense.com/)
-	Copyright (C) 2009 Scott Ullrich <sullrich@pfsense.com>
-	Copyright (C) 2008 Remco Hoef <remcoverhoef@pfsense.com>
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require("guiconfig.inc");
-require_once("haproxy.inc");
-
-function haproxy_acl_select($mode) {
-	global $a_acltypes;
-
-	$seltext = '';
-	foreach ($a_acltypes as $expr) {
-		if ($expr['mode'] == '' || $expr['mode'] == $mode)
-			$seltext .= "<option value='" . $expr['name'] . "'>" . $expr['descr'] .":</option>";
-	}
-	return $seltext;
-}
-
-$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty";
-
-if (!is_array($config['installedpackages']['haproxy']['ha_backends']['item'])) {
-	$config['installedpackages']['haproxy']['ha_backends']['item'] = array();
-}
-
-$a_backend = &$config['installedpackages']['haproxy']['ha_backends']['item'];
-$a_pools = &$config['installedpackages']['haproxy']['ha_pools']['item'];
-
-
-if (isset($_POST['id']))
-	$id = $_POST['id'];
-else
-	$id = $_GET['id'];
-
-if (isset($_GET['dup']))
-	$id = $_GET['dup'];
-
-if (isset($id) && $a_backend[$id]) {
-	$pconfig['name'] = $a_backend[$id]['name'];
-	$pconfig['desc'] = $a_backend[$id]['desc'];
-	$pconfig['status'] = $a_backend[$id]['status'];
-	$pconfig['connection_timeout'] = $a_backend[$id]['connection_timeout'];
-	$pconfig['server_timeout'] = $a_backend[$id]['server_timeout'];
-	$pconfig['retries'] = $a_backend[$id]['retries'];
-	
-	$pconfig['type'] = $a_backend[$id]['type'];
-	$pconfig['balance'] = $a_backend[$id]['balance'];
-
-	$pconfig['forwardfor'] = $a_backend[$id]['forwardfor'];
-	$pconfig['httpclose'] = $a_backend[$id]['httpclose'];
-
-	$pconfig['stats_enabled'] = $a_backend[$id]['stats_enabled'];
-	$pconfig['stats_username'] = $a_backend[$id]['stats_username'];
-	$pconfig['stats_password'] = $a_backend[$id]['stats_password'];
-	$pconfig['stats_uri'] = $a_backend[$id]['stats_uri'];
-	$pconfig['stats_realm'] = $a_backend[$id]['stats_realm'];
-	
-	$pconfig['type'] = $a_backend[$id]['type'];
-	$pconfig['extaddr'] = $a_backend[$id]['extaddr'];	
-	$pconfig['pool'] = $a_backend[$id]['pool'];	
-	$pconfig['max_connections'] = $a_backend[$id]['max_connections'];	
-	$pconfig['client_timeout'] = $a_backend[$id]['client_timeout'];	
-	$pconfig['port'] = $a_backend[$id]['port'];	
-	$pconfig['svrport'] = $a_backend[$id]['svrport'];	
-	$pconfig['a_acl']=&$a_backend[$id]['ha_acls']['item'];	
-	$pconfig['advanced'] = base64_decode($a_backend[$id]['advanced']);
-
-}
-
-if (isset($_GET['dup']))
-	unset($id);
-
-$changedesc = "Services: HAProxy: Listener";
-$changecount = 0;
-
-if ($_POST) {
-	$changecount++;
-
-	unset($input_errors);
-	$pconfig = $_POST;
-	
-	if ($_POST['stats_enabled']) {
-		$reqdfields = explode(" ", "name connection_timeout server_timeout stats_username stats_password stats_uri stats_realm");
-		$reqdfieldsn = explode(",", "Name,Connection timeout,Server timeout,Stats Username,Stats Password,Stats Uri,Stats Realm");		
-	} else {
-		$reqdfields = explode(" ", "name connection_timeout server_timeout");
-		$reqdfieldsn = explode(",", "Name,Connection timeout,Server timeout");		
-	}
-	
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
-
-	$reqdfields = explode(" ", "name type port max_connections client_timeout");
-	$reqdfieldsn = explode(",", "Name,Type,Port,Max connections,Client timeout");
-	
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
-
-	if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['name']))
-		$input_errors[] = "The field 'Name' contains invalid characters.";
-
-	if (!is_numeric($_POST['connection_timeout']))
-		$input_errors[] = "The field 'Connection timeout' value is not a number.";
-
-	if (!is_numeric($_POST['server_timeout']))
-		$input_errors[] = "The field 'Server timeout' value is not a number.";
-
-	if (!$_POST['retries'] && is_numeric($_POST['retries']))
-		$input_errors[] = "The field 'Retries' value is not a number.";
-
-	if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['stats_username']))
-		$input_errors[] = "The field 'Stats Username' contains invalid characters.";
-
-	if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['stats_password']))
-		$input_errors[] = "The field 'Stats Password' contains invalid characters.";
-
-	if (!is_numeric($_POST['max_connections']))
-		$input_errors[] = "The field 'Max connections' value is not a number.";
-
-	$ports = split(",", $_POST['port'] . ",");
-	foreach($ports as $port)
-		if ($port && !is_numeric($port))
-			$input_errors[] = "The field 'Port' value is not a number.";
-
-	if (!is_numeric($_POST['client_timeout']))
-		$input_errors[] = "The field 'Client timeout' value is not a number.";
-
-	/* Ensure that our pool names are unique */
-	for ($i=0; isset($config['installedpackages']['haproxy']['ha_backends']['item'][$i]); $i++)
-		if (($_POST['name'] == $config['installedpackages']['haproxy']['ha_backends']['item'][$i]['name']) && ($i != $id))
-			$input_errors[] = "This listener name has already been used. Listener names must be unique.";
-
-	$a_acl=array();			
-	$acl_names=array(); 
-	for($x=0; $x<99; $x++) {
-		$acl_name=$_POST['acl_name'.$x];
-		$acl_expression=$_POST['acl_expression'.$x];
-		$acl_value=$_POST['acl_value'.$x];
-
-		if ($acl_name) {
-			// check for duplicates
-			if (in_array($acl_name, $acl_names)) {
-				$input_errors[] = "The name '$acl_name' is duplicate.";
-			}
-
-			$acl_names[]=$acl_name;
-
-			$acl=array();
-			$acl['name']=$acl_name;
-			$acl['expression']=$acl_expression;
-			$acl['value']=$acl_value;
-			$a_acl[]=$acl;
-
-			if (preg_match("/[^a-zA-Z0-9\.\-_]/", $acl_name))
-				$input_errors[] = "The field 'Name' contains invalid characters.";
-
-			if (!preg_match("/.{2,}/", $acl_value))
-				$input_errors[] = "The field 'Value' is required.";
-
-			if (!preg_match("/.{2,}/", $acl_name))
-				$input_errors[] = "The field 'Name' is required.";
-
-			}
-	}
-
-	$pconfig['a_acl']=$a_acl;
-
-	if (!$input_errors) {
-		$backend = array();
-		if(isset($id) && $a_backend[$id])
-			$backend = $a_backend[$id];
-			
-		if($backend['name'] != "")
-			$changedesc .= " modified '{$backend['name']}' pool:";
-		
-
-		update_if_changed("name", $backend['name'], $_POST['name']);
-		update_if_changed("description", $backend['desc'], $_POST['desc']);
-		update_if_changed("status", $backend['status'], $_POST['status']);
-		update_if_changed("connection_timeout", $backend['connection_timeout'], $_POST['connection_timeout']);
-		update_if_changed("server_timeout", $backend['server_timeout'], $_POST['server_timeout']);
-		update_if_changed("retries", $backend['retries'], $_POST['retries']);
-		update_if_changed("type", $backend['type'], $_POST['type']);
-		update_if_changed("balance", $backend['balance'], $_POST['balance']);
-		update_if_changed("cookie_name", $backend['cookie_name'], $_POST['cookie_name']);
-		update_if_changed("forwardfor", $backend['forwardfor'], $_POST['forwardfor']);
-		update_if_changed("httpclose", $backend['httpclose'], $_POST['httpclose']);
-		update_if_changed("stats_enabled", $backend['stats_enabled'], $_POST['stats_enabled']);
-		update_if_changed("stats_username", $backend['stats_username'], $_POST['stats_username']);
-		update_if_changed("stats_password", $backend['stats_password'], $_POST['stats_password']);
-		update_if_changed("stats_uri", $backend['stats_uri'], $_POST['stats_uri']);
-		update_if_changed("stats_realm", $backend['stats_realm'], $_POST['stats_realm']);
-		update_if_changed("type", $backend['type'], $_POST['type']);
-		update_if_changed("port", $backend['port'], $_POST['port']);
-		update_if_changed("svrport", $backend['svrport'], $_POST['svrport']);
-		update_if_changed("extaddr", $backend['extaddr'], $_POST['extaddr']);
-		update_if_changed("pool", $backend['pool'], $_POST['pool']);
-		update_if_changed("max_connections", $backend['max_connections'], $_POST['max_connections']);
-		update_if_changed("client_timeout", $backend['client_timeout'], $_POST['client_timeout']);
-		update_if_changed("advanced", $backend['advanced'], base64_encode($_POST['advanced']));
-
-		$backend['ha_acls']['item'] = $a_acl;
-
-		if (isset($id) && $a_backend[$id]) {
-			$a_backend[$id] = $backend;
-		} else {
-			$a_backend[] = $backend;
-		}
-
-		if ($changecount > 0) {
-			touch($d_haproxyconfdirty_path);
-			write_config($changedesc);
-		}
-
-		header("Location: haproxy_listeners.php");
-		exit;
-	}
-}
-
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
-	$one_two = true;
-
-$pgtitle = "HAProxy: Listener: Edit";
-include("head.inc");
-
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php if($one_two): ?>
-<script type="text/javascript" src="/javascript/scriptaculous/prototype.js"></script>
-<script type="text/javascript" src="/javascript/scriptaculous/scriptaculous.js"></script>
-<?php endif; ?>
-<script type="text/javascript">
-	// Global Variables
-	var rowname = new Array(99);
-	var rowtype = new Array(99);
-	var newrow  = new Array(99);
-	var rowsize = new Array(99);
-
-	for (i = 0; i < 99; i++) {
-	        rowname[i] = '';
-	        rowtype[i] = '';
-	        newrow[i] = '';
-	        rowsize[i] = '25';
-	}
-
-	var field_counter_js = 0;
-	var loaded = 0;
-	var is_streaming_progress_bar = 0;
-	var temp_streaming_text = "";
-
-	var addRowTo = (function() {
-	    return (function (tableId) {
-	        var d, tbody, tr, td, bgc, i, ii, j, type, seltext;
-		var btable, btbody, btr, btd;
-
-	        d = document;
-		type = d.getElementById("type").value;
-		if (type == 'health')
-			seltext = "<?php echo haproxy_acl_select('health');?>";
-		else if (type == 'tcp')
-			seltext = "<?php echo haproxy_acl_select('tcp');?>";
-		else if (type == 'https')
-			seltext = "<?php echo haproxy_acl_select('https');?>";
-		else
-			seltext = "<?php echo haproxy_acl_select('http');?>";
-		if (seltext == '') {
-			alert("No ACL types available in current listener mode");
-			return;
-		}
-
-	        tbody = d.getElementById(tableId).getElementsByTagName("tbody").item(0);
-	        tr = d.createElement("tr");
-	        totalrows++;
-		tr.setAttribute("id","aclrow" + totalrows);
-	        for (i = 0; i < field_counter_js; i++) {
-	                td = d.createElement("td");
-	                if(rowtype[i] == 'textbox') {
-				td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
-					"'></input><input size='" + rowsize[i] + "' name='" + rowname[i] + totalrows +
-					"' id='" + rowname[i] + totalrows +
-				       	"'></input> ";
-	                } else if(rowtype[i] == 'select') {
-				td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
-					"'></input><select name='" + rowname[i] + totalrows + 
-					"' id='" + rowname[i] + totalrows +
-					"'>" + seltext + "</select> ";
-	                } else {
-				td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
-					"'></input><input type='checkbox' name='" + rowname[i] + totalrows +
-				        "' id='" + rowname[i] + totalrows + "'></input> ";
-	                }
-	                tr.appendChild(td);
-	        }
-		td = d.createElement("td");
-		td.rowSpan = "1";
-		td.setAttribute("class","list");
-
-		// Recreate the button table.
-		btable = document.createElement("table");
-		btable.setAttribute("border", "0");
-		btable.setAttribute("cellspacing", "0");
-		btable.setAttribute("cellpadding", "1");
-		btbody = document.createElement("tbody");
-		btr = document.createElement("tr");
-		btd = document.createElement("td");
-		btd.setAttribute("valign", "middle");
-		btd.innerHTML = '<img src="/themes/' + theme + '/images/icons/icon_x.gif" title="delete entry" width="17" height="17" border="0" onclick="removeRow(this); return false;">';
-		btr.appendChild(btd);
-		btd = document.createElement("td");
-		btd.setAttribute("valign", "middle");
-		btd.innerHTML = '<img src="/themes/' + theme + "/images/icons/icon_plus.gif\" title=\"duplicate entry\" width=\"17\" height=\"17\" border=\"0\" onclick=\"dupRow(" + totalrows + ", 'acltable'); return false;\">";
-		btr.appendChild(btd);
-		btbody.appendChild(btr);
-		btable.appendChild(btbody);
-
-		td.appendChild(btable);
-	        tr.appendChild(td);
-	        tbody.appendChild(tr);
-	    });
-	})();
-
-	function dupRow(rowId, tableId) {
-		var dupEl;
-		var newEl;
-
-		addRowTo(tableId);
-		for (i = 0; i < field_counter_js; i++) {
-			dupEl = document.getElementById(rowname[i] + rowId);
-			newEl = document.getElementById(rowname[i] + totalrows);
-			if (dupEl && newEl)
-				newEl.value = dupEl.value;
-		}
-	}
-
-	function removeRow(el) {
-	    var cel;
-	    // Break out of one table first
-	    while (el && el.nodeName.toLowerCase() != "table")
-		    el = el.parentNode;
-	    while (el && el.nodeName.toLowerCase() != "tr")
-	            el = el.parentNode;
-
-	    if (el && el.parentNode) {
-	        cel = el.getElementsByTagName("td").item(0);
-	        el.parentNode.removeChild(el);
-	    }
-	}
-
-	function find_unique_field_name(field_name) {
-	        // loop through field_name and strip off -NUMBER
-	        var last_found_dash = 0;
-	        for (var i = 0; i < field_name.length; i++) {
-	                // is this a dash, if so, update
-	                //    last_found_dash
-	                if (field_name.substr(i,1) == "-" )
-	                        last_found_dash = i;
-	        }
-	        if (last_found_dash < 1)
-	                return field_name;
-	        return(field_name.substr(0,last_found_dash));
-	}
-
-	rowname[0] = "acl_name";
-	rowtype[0] = "textbox";
-	rowsize[0] = "20";
-
-	rowname[1] = "acl_expression";
-	rowtype[1] = "select";
-	rowsize[1] = "10";
-
-	rowname[2] = "acl_value";
-	rowtype[2] = "textbox";
-	rowsize[2] = "35";
-
-	function toggle_stats() {
-		var stats_enabled=document.getElementById('stats_enabled');
-		var stats_realm_row=document.getElementById('stats_realm_row');
-		var stats_username_row=document.getElementById('stats_username_row');
-		var stats_password_row=document.getElementById('stats_password_row');
-		var stats_uri_row=document.getElementById('stats_uri_row');
-		
-		if (stats_enabled.checked) {
-			stats_realm_row.style.display='';
-			stats_username_row.style.display='';
-			stats_password_row.style.display='';
-			stats_uri_row.style.display='';
-		} else {
-			stats_realm_row.style.display='none';
-			stats_username_row.style.display='none';
-			stats_password_row.style.display='none';
-			stats_uri_row.style.display='none';
-		}
-	}
-	function type_change() {
-		var type, d, i, j, el, row;
-		var count = <?=count($a_acltypes);?>;
-		var acl = [ <?php foreach ($a_acltypes as $expr) echo "'".$expr['name']."'," ?> ];
-		var mode = [ <?php foreach ($a_acltypes as $expr) echo "'".$expr['mode']."'," ?> ];
-
-	        d = document;
-		type = d.getElementById("type").value;
-		for (i = 0; i < 99; i++) {
-			el = d.getElementById("acl_expression" + i);
-			row = d.getElementById("aclrow" + i);
-			if (!el)
-				continue;
-			for (j = 0; j < count; j++) {
-				if (acl[j] == el.value) {
-					if (mode[j] != '' && mode[j] != type) {
-						Effect.Fade(row,{ duration: 1.0 });
-					} else {
-						Effect.Appear(row,{ duration: 1.0 });
-					}
-				}
-			}
-		}
-	}
-</script>
-<?php include("fbegin.inc"); ?>
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if($one_two): ?>
-<p class="pgtitle"><?=$pgtitle?></p>
-<?php endif; ?>
-<form action="haproxy_listeners_edit.php" method="post" name="iform" id="iform">
-	<table width="100%" border="0" cellpadding="6" cellspacing="0">
-		<tr>
-			<td colspan="2" valign="top" class="listtopic">Edit haproxy listener</td>
-		</tr>
-		<tr>
-			<td width="22%" valign="top" class="vncellreq">Name</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="name" type="text" <?if(isset($pconfig['name'])) echo "value=\"{$pconfig['name']}\"";?> size="25" maxlength="25">
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncell">Description</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="desc" type="text" <?if(isset($pconfig['desc'])) echo "value=\"{$pconfig['desc']}\"";?> size="64">
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncellreq">Status</td>
-			<td width="78%" class="vtable" colspan="2">
-				<select name="status" id="status">
-					<option value="active"<?php if($pconfig['status'] == "active") echo " SELECTED"; ?>>Active</option>
-					<option value="disabled"<?php if($pconfig['status'] == "disabled") echo " SELECTED"; ?>>Disabled</option>
-				</select>
-			</td>
-		</tr>		
-		<tr>
-			  <td width="22%" valign="top" class="vncellreq">External address</td>
-			  <td width="78%" class="vtable">
-				<select name="extaddr" class="formfld">
-					<option value="" <?php if (!$pconfig['extaddr']) echo "selected"; ?>>Interface address</option>
-				<?php
-					if (is_array($config['virtualip']['vip'])):
-						foreach ($config['virtualip']['vip'] as $sn): 
-				?>
-					<option value="<?=$sn['subnet'];?>" <?php if ($sn['subnet'] == $pconfig['extaddr']) echo "selected"; ?>>
-						<?=htmlspecialchars("{$sn['subnet']} ({$sn['descr']})");?>
-					</option>
-				<?php
-						endforeach;
-					endif; 	
-				?>
-						<option value="any" <?php if($pconfig['extaddr'] == "any") echo "selected"; ?>>any</option>
-				</select>
-				<br />
-				<span class="vexpl">
-					If you want this rule to apply to another IP address than the IP address of the interface chosen above,
-					select it here (you need to define <a href="firewall_virtual_ip.php">Virtual IP</a> addresses on the first).  
-					Also note that if you are trying to redirect connections on the LAN select the "any" option.
-				</span>
-			  </td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncellreq">External port</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="port" type="text" <?if(isset($pconfig['port'])) echo "value=\"{$pconfig['port']}\"";?> size="10" maxlength="10">
-				<div>The port to listen to.  To specify multiple ports, separate with a comma (,). EXAMPLE: 80,443</div>
-			</td>
-		</tr>
-		<tr>
-			  <td width="22%" valign="top" class="vncellreq">Server pool</td>
-			  <td width="78%" class="vtable">
-				<select name="pool" class="formfld">
-				<?php
-					if (is_array($a_pools)) {
-						foreach ($a_pools as $p): 
-				?>
-					<option value="<?=$p['name'];?>" <?php if ($p['name'] == $pconfig['pool']) echo "selected"; ?>>
-						<?=htmlspecialchars("{$p['name']}");?>
-					</option>
-				<?php
-						endforeach;
-					} else { 	
-				?>
-					<option value="-">-</option>
-				<?php
-					}
-				?>
-				</select>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncell">Server Port</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="svrport" type="text" <?if(isset($pconfig['svrport'])) echo "value=\"{$pconfig['svrport']}\"";?> size="10" maxlength="10">
-				<div>The default server port.</div>
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncellreq">Type</td>
-			<td width="78%" class="vtable" colspan="2">
-				<select name="type" id="type" onchange="type_change();">
-					<option value="http"<?php if($pconfig['type'] == "http") echo " SELECTED"; ?>>HTTP</option>
-					<option value="https"<?php if($pconfig['type'] == "https") echo " SELECTED"; ?>>HTTPS</option>
-					<option value="tcp"<?php if($pconfig['type'] == "tcp") echo " SELECTED"; ?>>TCP</option>
-					<option value="health"<?php if($pconfig['type'] == "health") echo " SELECTED"; ?>>Health</option>
-				</select>
-			</td>
-		</tr>		
-		<tr>
-			<td width="22%" valign="top" class="vncell">Access Control lists</td>
-			<td width="78%" class="vtable" colspan="2" valign="top">
-			<table class="" width="100%" cellpadding="0" cellspacing="0" id='acltable'>
-	                <tr>
-	                  <td width="35%" class="">Name</td>
-	                  <td width="40%" class="">Expression</td>
-	                  <td width="20%" class="">Value</td>
-	                  <td width="5%" class=""></td>
-			</tr>
-			<?php 
-			$a_acl=$pconfig['a_acl'];
-
-			if (!is_array($a_acl)) {
-				$a_acl=array();
-			}
-
-			$counter=0;
-			foreach ($a_acl as $acl) {
-				$t = haproxy_find_acl($acl['expression']);
-				$display = '';
-				if (!$t || ($t['mode'] != '' && $t['mode'] != strtolower($pconfig['type'])))
-					$display = 'style="display: none;"';
-			?>
-			<tr id="aclrow<?=$counter;?>" <?=$display;?>>
-				<td><input name="acl_name<?=$counter;?>" id="acl_name<?=$counter;?>" type="text" value="<?=$acl['name']; ?>" size="20"/></td>
-				<td>
-				<select name="acl_expression<?=$counter;?>" id="acl_expression<?=$counter;?>">
-				<?php
-				foreach ($a_acltypes as $expr) { ?>
-					<option value="<?=$expr['name'];?>"<?php if($acl['expression'] == $expr['name']) echo " SELECTED"; ?>><?=$expr['descr'];?>:</option>
-				<?php } ?>
-				</select>
-				</td>
-				<td><input name="acl_value<?=$counter;?>" id="acl_value<?=$counter;?>" type="text" value="<?=$acl['value']; ?>" size="35"/></td>
-			  	<td class="list">
-			         <table border="0" cellspacing="0" cellpadding="1"><tr>
-			         <td valign="middle">
-				  <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="delete entry" width="17" height="17" border="0" onclick="removeRow(this); return false;">
-			         </td>
-			         <td valign="middle">
-				 <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="duplicate entry" width="17" height="17" border="0" onclick="dupRow(<?=$counter;?>, 'acltable'); return false;">
-			         </td></tr></table>
-				</td>
-			</tr>
-			<?php
-			$counter++;
-			}
-			?>
-			</table>
-			<a onclick="javascript:addRowTo('acltable'); return false;" href="#">
-			<img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="add another entry" />
-			</a><br/>
-			For more information about ACL's please see <a href='http://haproxy.1wt.eu/download/1.3/doc/configuration.txt' target='_new'>HAProxy Documentation</a> Section 7 - Using ACL's
-			</td>
-		</tr>
-	</table>
-	<table width="100%" border="0" cellpadding="6" cellspacing="0">
-		<tr>
-			<td colspan="2" valign="top" class="listtopic">Advanced settings</td>
-		</tr>		
-		<tr align="left">
-			<td width="22%" valign="top" class="vncellreq">Connection timeout</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="connection_timeout" type="text" <?if(isset($pconfig['connection_timeout'])) echo "value=\"{$pconfig['connection_timeout']}\"";?> size="64">
-				<div>the time (in milliseconds) we give up if the connection does not complete within (30000).</div>
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncellreq">Server timeout</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="server_timeout" type="text" <?if(isset($pconfig['server_timeout'])) echo "value=\"{$pconfig['server_timeout']}\"";?> size="64">
-				<div>the time (in milliseconds) we accept to wait for data from the server, or for the server to accept data (30000).</div>
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncell">Retries</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="retries" type="text" <?if(isset($pconfig['retries'])) echo "value=\"{$pconfig['retries']}\"";?> size="64">
-				<div>After a connection failure to a server, it is possible to retry, potentially
-on another server. This is useful if health-checks are too rare and you don't
-want the clients to see the failures. The number of attempts to reconnect is
-set by the 'retries' parameter (2).</div>
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncellreq">Balance</td>
-			<td width="78%" class="vtable" colspan="2">
-				<table width="100%">
-				<tr>
-					<td width="20%" valign="top">
-						<input type="radio" name="balance" id="balance" value="roundrobin"<?php if($pconfig['balance'] == "roundrobin") echo " CHECKED"; ?>>Round robin
-					</td>
-					<td>
-						  Each server is used in turns, according to their weights.
-		                  This is the smoothest and fairest algorithm when the server's
-		                  processing time remains equally distributed. This algorithm
-		                  is dynamic, which means that server weights may be adjusted
-		                  on the fly for slow starts for instance.
-					</td>
-				</tr>
-				  <tr><td valign="top"><input type="radio" name="balance" id="balance" value="source"<?php if($pconfig['balance'] == 
-"source") echo " CHECKED"; ?>>Source</td><td>
-		 			  The source IP address is hashed and divided by the total
-	                  weight of the running servers to designate which server will
-	                  receive the request. This ensures that the same client IP
-	                  address will always reach the same server as long as no
-	                  server goes down or up. If the hash result changes due to the
-	                  number of running servers changing, many clients will be
-					  directed to a different server. This algorithm is generally
-	                  used in TCP mode where no cookie may be inserted. It may also
-	                  be used on the Internet to provide a best-effort stickyness
-	                  to clients which refuse session cookies. This algorithm is
-	                  static, which means that changing a server's weight on the
-	                  fly will have no effect.
-					</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncell">Stats Enabled</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input id="stats_enabled" name="stats_enabled" type="checkbox" value="yes" <?php if ($pconfig['stats_enabled']=='yes') echo "checked"; ?> onclick='toggle_stats();'><br/>
-				EXAMPLE: haproxystats
-			</td>
-		</tr>
-		<tr align="left" id='stats_realm_row' name='stats_realm_row' <?if ($pconfig['stats_enabled']!='yes') echo "style=\"display: none;\"";?>>
-			<td width="22%" valign="top" class="vncellreq">Stats Realm</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input id="stats_realm" name="stats_realm" type="text" <?if(isset($pconfig['stats_realm'])) echo "value=\"{$pconfig['stats_realm']}\"";?> size="64">
-			</td>
-		</tr>
-		<tr align="left" id='stats_uri_row' name='stats_uri_row' <?if ($pconfig['stats_enabled']!='yes') echo "style=\"display: none;\"";?>>
-			<td width="22%" valign="top" class="vncellreq">Stats Uri</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input id="stats_uri" name="stats_uri" type="text" <?if(isset($pconfig['stats_uri'])) echo "value=\"{$pconfig['stats_uri']}\"";?> size="64"><br/>
-				EXAMPLE: /haproxy?stats
-			</td>
-		</tr>
-		<tr align="left" id='stats_username_row' name='stats_username_row' <?if ($pconfig['stats_enabled']!='yes') echo "style=\"display: none;\"";?>>
-			<td width="22%" valign="top" class="vncellreq">Stats Username</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input id="stats_username" name="stats_username" type="text" <?if(isset($pconfig['stats_username'])) echo "value=\"{$pconfig['stats_username']}\"";?> size="64">
-			</td>
-		</tr>
-		
-		<tr align="left" id='stats_password_row' name='stats_password_row' <?if ($pconfig['stats_enabled']!='yes') echo "style=\"display: none;\"";?>>
-			<td width="22%" valign="top" class="vncellreq">Stats Password</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input id="stats_password" name="stats_password" type="password" <?if(isset($pconfig['stats_password'])) echo "value=\"{$pconfig['stats_password']}\"";?> size="64">
-				<br/>
-			</td>
-		</tr>
-				<tr align="left">
-					<td width="22%" valign="top" class="vncellreq">Max connections</td>
-					<td width="78%" class="vtable" colspan="2">
-						<input name="max_connections" type="text" <?if(isset($pconfig['max_connections'])) echo "value=\"{$pconfig['max_connections']}\"";?> size="10" maxlength="10">
-					</td>
-				</tr>
-				<tr align="left">
-					<td width="22%" valign="top" class="vncellreq">Client timeout</td>
-					<td width="78%" class="vtable" colspan="2">
-						<input name="client_timeout" type="text" <?if(isset($pconfig['client_timeout'])) echo "value=\"{$pconfig['client_timeout']}\"";?> size="10" maxlength="10">
-						<div>the time (in milliseconds) we accept to wait for data from the client, or for the client to accept data (30000).</div>
-					</td>
-				</tr>
-<?php
-?>
-			<tr align="left">
-				<td width="22%" valign="top" class="vncell">Use 'forwardfor' option</td>
-				<td width="78%" class="vtable" colspan="2">
-					<input id="forwardfor" name="forwardfor" type="checkbox" value="yes" <?php if ($pconfig['forwardfor']=='yes') echo "checked"; ?>>
-					<br/>
-					The 'forwardfor' option creates an HTTP 'X-Forwarded-For' header which
-					contains the client's IP address. This is useful to let the final web server
-					know what the client address was (eg for statistics on domains)
-				</td>
-			</tr>
-			<tr align="left">
-				<td width="22%" valign="top" class="vncell">Use 'httpclose' option</td>
-				<td width="78%" class="vtable" colspan="2">
-					<input id="httpclose" name="httpclose" type="checkbox" value="yes" <?php if ($pconfig['httpclose']=='yes') echo "checked"; ?>>
-					<br/>
-					The 'httpclose' option removes any 'Connection' header both ways, and
-					adds a 'Connection: close' header in each direction. This makes it easier to
-					disable HTTP keep-alive than the previous 4-rules block.
-				</td>
-			</tr>
-			<tr align="left">
-				<td width="22%" valign="top" class="vncell">Advanced pass thru</td>
-				<td width="78%" class="vtable" colspan="2">
-					<textarea name='advanced' rows="4" cols="70" id='advanced'><?php echo $pconfig['advanced']; ?></textarea>
-					<br/>
-					NOTE: paste text into this box that you would like to pass thru.
-				</td>
-			</tr>
-			<tr align="left">
-			<td width="22%" valign="top">&nbsp;</td>
-			<td width="78%">
-				<input name="Submit" type="submit" class="formbtn" value="Save">  
-				<input type="button" class="formbtn" value="Cancel" onclick="history.back()">
-				<?php if (isset($id) && $a_backend[$id]): ?>
-				<input name="id" type="hidden" value="<?=$id;?>">
-				<?php endif; ?>
-			</td>
-		</tr>
-		<tr>
-			<br/>&nbsp;<br/>
-			<td colspan='3'>
-					<span class="vexpl"><b>NOTE:</b> You must add a firewall rule permitting access to this frontend!</span>
-			</td>
-		</tr>
-	</table>
-	</form>
-<br>
-<script type="text/javascript">
-	field_counter_js = 3;
-	rows = 1;
-	totalrows =  <?php echo $counter; ?>;
-	loaded =  <?php echo $counter; ?>;
-</script>
-<?php include("fend.inc"); ?>
-</body>
-</html>
diff --git a/config/haproxy-dev/haproxy_pool_edit.php b/config/haproxy-dev/haproxy_pool_edit.php
deleted file mode 100755
index d25f0675..00000000
--- a/config/haproxy-dev/haproxy_pool_edit.php
+++ /dev/null
@@ -1,494 +0,0 @@
-<?php
-/* $Id: load_balancer_pool_edit.php,v 1.24.2.23 2007/03/03 00:07:09 smos Exp $ */
-/*
-	haproxy_pool_edit.php
-	part of pfSense (http://www.pfsense.com/)
-	Copyright (C) 2009 Scott Ullrich <sullrich@pfsense.com>
-	Copyright (C) 2008 Remco Hoef <remcoverhoef@pfsense.com>
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require("guiconfig.inc");
-
-$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty";
-
-if (!is_array($config['installedpackages']['haproxy']['ha_pools']['item'])) {
-	$config['installedpackages']['haproxy']['ha_pools']['item'] = array();
-}
-
-$a_pools = &$config['installedpackages']['haproxy']['ha_pools']['item'];
-
-if (isset($_POST['id']))
-	$id = $_POST['id'];
-else
-	$id = $_GET['id'];
-
-if (isset($_GET['dup']))
-	$id = $_GET['dup'];
-
-if (isset($id) && $a_pools[$id]) {
-	$pconfig['name'] = $a_pools[$id]['name'];
-	$pconfig['checkinter'] = $a_pools[$id]['checkinter'];
-	$pconfig['monitor_uri'] = $a_pools[$id]['monitor_uri'];
-	$pconfig['cookie'] = $a_pools[$id]['cookie'];
-	$pconfig['advanced'] = base64_decode($a_pools[$id]['advanced']);
-	$pconfig['a_servers']=&$a_pools[$id]['ha_servers']['item'];	
-}
-
-if (isset($_GET['dup']))
-	unset($id);
-
-$changedesc = "Services: HAProxy: pools: ";
-$changecount = 0;
-
-if ($_POST) {
-	$changecount++;
-
-	unset($input_errors);
-	$pconfig = $_POST;
-	
-	$reqdfields = explode(" ", "name");
-	$reqdfieldsn = explode(",", "Name");		
-
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
-
-	if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['name']))
-		$input_errors[] = "The field 'Name' contains invalid characters.";
-
-	/* Ensure that our pool names are unique */
-	for ($i=0; isset($config['installedpackages']['haproxy']['ha_pools']['item'][$i]); $i++)
-		if (($_POST['name'] == $config['installedpackages']['haproxy']['ha_pools']['item'][$i]['name']) && ($i != $id))
-			$input_errors[] = "This pool name has already been used.  Pool names must be unique.";
-
-	$a_servers=array();			
-	for($x=0; $x<99; $x++) {
-		$server_name=$_POST['server_name'.$x];
-		$server_address=$_POST['server_address'.$x];
-		$server_port=$_POST['server_port'.$x];
-		$server_weight=$_POST['server_weight'.$x];
-		$server_backup=$_POST['server_backup'.$x];
-
-		if ($server_address) {
-
-			$server=array();
-			$server['name']=$server_name;
-			$server['address']=$server_address;
-			$server['port']=$server_port;
-			$server['weight']=$server_weight;
-			$server['backup']=$server_backup;
-			$a_servers[]=$server;
-
-			if (preg_match("/[^a-zA-Z0-9\.\-_]/", $server_name))
-				$input_errors[] = "The field 'Name' contains invalid characters.";
-			if (preg_match("/[^a-zA-Z0-9\.\-_]/", $server_address))
-				$input_errors[] = "The field 'Address' contains invalid characters.";
-
-			if (!preg_match("/.{2,}/", $server_name))
-				$input_errors[] = "The field 'Name' is required.";
-
-			if (!preg_match("/.{2,}/", $server_address))
-				$input_errors[] = "The field 'Address' is required.";
-
-			if (!preg_match("/.{2,}/", $server_weight))
-				$input_errors[] = "The field 'Weight' is required.";
-
-			if (!is_numeric($server_weight))
-				$input_errors[] = "The field 'Weight' value is not a number.";
-			if ($server_port && !is_numeric($server_port))
-				$input_errors[] = "The field 'Port' value is not a number.";
-		}
-	}
-
-	if (!$input_errors) {
-		$pool = array();
-		if(isset($id) && $a_pools[$id])
-			$pool = $a_pools[$id];
-			
-		if ($pool['name'] != $_POST['name']) {
-			// name changed:
-			if (!is_array($config['installedpackages']['haproxy']['ha_backends']['item'])) {
-				$config['installedpackages']['haproxy']['ha_backends']['item'] = array();
-			}
-			$a_backend = &$config['installedpackages']['haproxy']['ha_backends']['item'];
-
-			for ( $i = 0; $i < count($a_backend); $i++) {
-				if ($a_backend[$i]['pool'] == $pool['name'])
-					$a_backend[$i]['pool'] = $_POST['name'];
-			}
-		}
-
-		if($pool['name'] != "")
-			$changedesc .= " modified '{$pool['name']}' pool:";
-
-		$pool['ha_servers']['item']=$a_servers;
-
-		update_if_changed("name", $pool['name'], $_POST['name']);
-		update_if_changed("cookie", $pool['cookie'], $_POST['cookie']);
-		update_if_changed("advanced", $pool['advanced'], base64_encode($_POST['advanced']));
-		update_if_changed("checkinter", $pool['checkinter'], $_POST['checkinter']);
-		update_if_changed("monitor_uri", $pool['monitor_uri'], $_POST['monitor_uri']);
-
-		if (isset($id) && $a_pools[$id]) {
-			$a_pools[$id] = $pool;
-		} else {
-			$a_pools[] = $pool;
-		}
-
-		if ($changecount > 0) {
-			touch($d_haproxyconfdirty_path);
-			write_config($changedesc);			
-			/*
-			echo "<PRE>";
-			print_r($config);
-			echo "</PRE>";
-			*/
-		}
-
-		header("Location: haproxy_pools.php");
-		exit;
-	}
-	$pconfig['a_servers']=&$a_pools[$id]['ha_servers']['item'];	
-}
-
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
-	$one_two = true;
-
-$pgtitle = "HAProxy: pool: Edit";
-include("head.inc");
-
-row_helper();
-
-?>
-
-<input type='hidden' name='address_type' value='textbox' />
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<script type="text/javascript" language="javascript" src="pool.js"></script>
-
-<script language="javascript">
-function clearcombo(){
-  for (var i=document.iform.serversSelect.options.length-1; i>=0; i--){
-    document.iform.serversSelect.options[i] = null;
-  }
-  document.iform.serversSelect.selectedIndex = -1;
-}
-</script>
-<script type="text/javascript">
-	rowname[0] = "server_name";
-	rowtype[0] = "textbox";
-	rowsize[0] = "30";
-	rowname[1] = "server_address";
-	rowtype[1] = "textbox";
-	rowsize[1] = "30";
-	rowname[2] = "server_port";
-	rowtype[2] = "textbox";
-	rowsize[2] = "5";
-	rowname[3] = "server_weight";
-	rowtype[3] = "textbox";
-	rowsize[3] = "5";
-	rowname[4] = "server_backup";
-	rowtype[4] = "checkbox";
-	rowsize[4] = "5";
-</script>
-<?php include("fbegin.inc"); ?>
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if($one_two): ?>
-<p class="pgtitle"><?=$pgtitle?></p>
-<?php endif; ?>
-	<form action="haproxy_pool_edit.php" method="post" name="iform" id="iform">
-	<table width="100%" border="0" cellpadding="6" cellspacing="0">
-		<tr>
-			<td colspan="2" valign="top" class="listtopic">Edit HAProxy pool</td>
-		</tr>	
-		<tr align="left">
-			<td width="22%" valign="top" class="vncellreq">Name</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="name" type="text" <?if(isset($pconfig['name'])) echo "value=\"{$pconfig['name']}\"";?> size="16" maxlength="16">
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncell">Cookie</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="cookie" type="text" <?if(isset($pconfig['cookie'])) echo "value=\"{$pconfig['cookie']}\"";?>size="64"><br/>
-				  This value will be checked in incoming requests, and the first
-				  operational pool possessing the same value will be selected. In return, in
-				  cookie insertion or rewrite modes, this value will be assigned to the cookie
-				  sent to the client. There is nothing wrong in having several servers sharing
-				  the same cookie value, and it is in fact somewhat common between normal and
-				  backup servers. See also the "cookie" keyword in backend section.
-				
-			</td>
-		</tr>
-		<tr align="left">
-			<td class="vncellreq" colspan="3">Server list</td>
-		</tr>
-		<tr>
-			<td width="78%" class="vtable" colspan="2" valign="top">
-			<table class="" width="100%" cellpadding="0" cellspacing="0" id='servertable'>
-	                <tr>
-	                  <td width="30%" class="">Name</td>
-	                  <td width="30%" class="">Address</td>
-	                  <td width="18%" class="">Port</td>
-	                  <td width="18%" class="">Weight</td>
-	                  <td width="5%" class="">Backup</td>
-	                  <td width="4%" class=""></td>
-			</tr>
-			<?php 
-			$a_servers=$pconfig['a_servers'];
-
-			if (!is_array($a_servers)) {
-				$a_servers=array();
-			}
-
-			$counter=0;
-			foreach ($a_servers as $server) {
-			?>
-			<tr id="tr_view_<?=$counter;?>" name="tr_view_<?=$counter;?>">
-			<td class="vtable"><?=$server['name']; ?></td>
-			<td class="vtable"><?=$server['address']; ?></td>
-			<td class="vtable"><?=$server['port']; ?></td>
-			<td class="vtable"><?=$server['weight']; ?></td>
-			<td class="vtable"><?=$server['backup']; ?></td>
-			<td class="list">
-			  <table border="0" cellspacing="0" cellpadding="1"><tr>
-			  <td valign="middle">
-			  <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="edit entry" width="17" height="17" border="0" onclick="editRow(<?=$counter;?>); return false;">
-			  </td>
-			  <td valign="middle">
-			  <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="duplicate entry" width="17" height="17" border="0" onclick="dupRow(<?=$counter;?>, 'servertable'); return false;">
-			  </td></tr></table>
-			</td>
-			</tr>
-			<tr id="tr_edit_<?=$counter;?>" name="tr_edit_<?=$counter;?>" style="display: none;">
-				<td class="vtable">
-				  <input name="server_name<?=$counter;?>" id="server_name<?=$counter;?>" type="text" value="<?=$server['name']; ?>" size="30"/></td>
-				<td class="vtable">
-				  <input name="server_address<?=$counter;?>" id="server_address<?=$counter;?>" type="text" value="<?=$server['address']; ?>" size="30"/></td>
-				<td class="vtable">
-				  <input name="server_port<?=$counter;?>" id="server_port<?=$counter;?>" type="text" value="<?=$server['port']; ?>" size="5"/></td>
-				<td class="vtable">
-				  <input name="server_weight<?=$counter;?>" id="server_weight<?=$counter;?>" type="text" value="<?=$server['weight']; ?>" size="5"/></td>
-				<td class="vtable">
-				  <input name="server_backup<?=$counter;?>" id="server_backup<?=$counter;?>" type="checkbox" value="yes" <?php if ($server['backup']=='yes') echo "checked"; ?>/></td>
-				<td class="list">
-			         <table border="0" cellspacing="0" cellpadding="1"><tr>
-			         <td valign="middle">
-				  <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="delete entry" width="17" height="17" border="0" onclick="removeRow(this); return false;">
-			         </td>
-			         <td valign="middle">
-				 <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="duplicate entry" width="17" height="17" border="0" onclick="dupRow(<?=$counter;?>, 'servertable'); return false;">
-			         </td></tr></table>
-				</td>
-			</tr>
-			<?php
-			$counter++;
-			}
-			?>
-			</table>
-			<a onclick="javascript:addRowTo('servertable'); return false;" href="#">
-			<img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="add another entry" />
-			</a>
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncell">Check freq</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="checkinter" type="text" <?if(isset($pconfig['checkinter'])) echo "value=\"{$pconfig['checkinter']}\"";?>size="20"> milliseconds
-				<br/>Defaults to 1000 if left blank.
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncell">Health check URI</td>
-			<td width="78%" class="vtable" colspan="2">
-				<input name="monitor_uri" type="text" <?if(isset($pconfig['monitor_uri'])) echo "value=\"{$pconfig['monitor_uri']}\"";?>size="64">
-				<br/>Defaults to / if left blank.
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top" class="vncell">Advanced pass thru</td>
-			<td width="78%" class="vtable" colspan="2">
-				<textarea name='advanced' rows="4" cols="70" id='advanced'><?php echo $pconfig['advanced']; ?></textarea>
-				<br/>
-				NOTE: paste text into this box that you would like to pass thru.
-			</td>
-		</tr>
-		<tr align="left">
-			<td width="22%" valign="top">&nbsp;</td>
-			<td width="78%">
-				<input name="Submit" type="submit" class="formbtn" value="Save">  
-				<input type="button" class="formbtn" value="Cancel" onclick="history.back()">
-				<?php if (isset($id) && $a_pools[$id]): ?>
-				<input name="id" type="hidden" value="<?=$id;?>">
-				<?php endif; ?>
-			</td>
-		</tr>
-	</table>
-	</form>
-<br>
-<?php include("fend.inc"); ?>
-<script type="text/javascript">
-	field_counter_js = 5;
-	rows = 1;
-	totalrows =  <?php echo $counter; ?>;
-	loaded =  <?php echo $counter; ?>;
-</script>
-</body>
-</html>
-
-<?php
-
-function row_helper() {
-	echo <<<EOF
-<script type="text/javascript">
-// Global Variables
-var rowname = new Array(99);
-var rowtype = new Array(99);
-var newrow  = new Array(99);
-var rowsize = new Array(99);
-
-for (i = 0; i < 99; i++) {
-	rowname[i] = '';
-	rowtype[i] = '';
-	newrow[i] = '';
-	rowsize[i] = '25';
-}
-
-var field_counter_js = 0;
-var loaded = 0;
-var is_streaming_progress_bar = 0;
-var temp_streaming_text = "";
-
-var addRowTo = (function() {
-    return (function (tableId) {
-	var d, tbody, tr, td, bgc, i, ii, j;
-	var btable, btbody, btr, btd;
-
-	d = document;
-	tbody = d.getElementById(tableId).getElementsByTagName("tbody").item(0);
-	tr = d.createElement("tr");
-	totalrows++;
-	for (i = 0; i < field_counter_js; i++) {
-		td = d.createElement("td");
-		if(rowtype[i] == 'textbox') {
-			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
-				"'></input><input size='" + rowsize[i] + "' name='" + rowname[i] + totalrows +
-				"' id='" + rowname[i] + totalrows + "'></input> ";
-		} else if(rowtype[i] == 'select') {
-			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
-				"'></input><select size='" + rowsize[i] + "' name='" + rowname[i] + totalrows +
-			       	"' id='" + rowname[i] + totalrows + "'>$options</select> ";
-		} else {
-			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
-				"'></input><input type='checkbox' name='" + rowname[i] + totalrows +
-				"' id='" + rowname[i] + totalrows + "' value='yes'></input> ";
-		}
-		td.setAttribute("class","vtable");
-		tr.appendChild(td);
-	}
-	td = d.createElement("td");
-	td.rowSpan = "1";
-        td.setAttribute("class","list");
-
-	// Recreate the button table.
-	btable = document.createElement("table");
-	btable.setAttribute("border", "0");
-	btable.setAttribute("cellspacing", "0");
-	btable.setAttribute("cellpadding", "1");
-	btbody = document.createElement("tbody");
-	btr = document.createElement("tr");
-	btd = document.createElement("td");
-	btd.setAttribute("valign", "middle");
-	btd.innerHTML = '<img src="/themes/' + theme + '/images/icons/icon_x.gif" title="delete entry" width="17" height="17" border="0" onclick="removeRow(this); return false;">';
-	btr.appendChild(btd);
-	btd = document.createElement("td");
-	btd.setAttribute("valign", "middle");
-	btd.innerHTML = '<img src="/themes/' + theme + "/images/icons/icon_plus.gif\" title=\"duplicate entry\" width=\"17\" height=\"17\" border=\"0\" onclick=\"dupRow(" + totalrows + ", 'servertable'); return false;\">";
-	btr.appendChild(btd);
-	btbody.appendChild(btr);
-	btable.appendChild(btbody);
-
-	td.appendChild(btable);
-	tr.appendChild(td);
-	tbody.appendChild(tr);
-    });
-})();
-
-function dupRow(rowId, tableId) {
-    var dupEl;
-    var newEl;
-
-    addRowTo(tableId);
-    for (i = 0; i < field_counter_js; i++) {
-        dupEl = document.getElementById(rowname[i] + rowId);
-        newEl = document.getElementById(rowname[i] + totalrows);
-	if (dupEl && newEl)
-	    if(rowtype[i] == 'checkbox')
-		newEl.checked = dupEl.checked;
-	    else
-                newEl.value = dupEl.value;
-    }
-}
-
-function removeRow(el) {
-    var cel;
-    // Break out of one table first
-    while (el && el.nodeName.toLowerCase() != "table")
-	    el = el.parentNode;
-    while (el && el.nodeName.toLowerCase() != "tr")
-	    el = el.parentNode;
-
-    if (el && el.parentNode) {
-	cel = el.getElementsByTagName("td").item(0);
-	el.parentNode.removeChild(el);
-    }
-}
-function editRow(num) {
-    var trview = document.getElementById('tr_view_' + num);
-    var tredit = document.getElementById('tr_edit_' + num);
-
-    trview.style.display='none';
-    tredit.style.display='';
-}
-
-function find_unique_field_name(field_name) {
-	// loop through field_name and strip off -NUMBER
-	var last_found_dash = 0;
-	for (var i = 0; i < field_name.length; i++) {
-		// is this a dash, if so, update
-		//    last_found_dash
-		if (field_name.substr(i,1) == "-" )
-			last_found_dash = i;
-	}
-	if (last_found_dash < 1)
-		return field_name;
-	return(field_name.substr(0,last_found_dash));
-}
-</script>
-
-EOF;
-
-}
-
-?>
diff --git a/config/haproxy-dev/haproxy_pools.php b/config/haproxy-dev/haproxy_pools.php
deleted file mode 100755
index c5adc70b..00000000
--- a/config/haproxy-dev/haproxy_pools.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/* $Id: load_balancer_virtual_server.php,v 1.6.2.1 2006/01/02 23:46:24 sullrich Exp $ */
-/*
-	haproxy_pools.php
-	part of pfSense (http://www.pfsense.com/)
-	Copyright (C) 2009 Scott Ullrich <sullrich@pfsense.com>
-	Copyright (C) 2008 Remco Hoef <remcoverhoef@pfsense.com>
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once("guiconfig.inc");
-require_once("haproxy.inc");
-
-$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty";
-
-if (!is_array($config['installedpackages']['haproxy']['ha_pools']['item'])) {
-	$config['installedpackages']['haproxy']['ha_pools']['item'] = array();
-}
-if (!is_array($config['installedpackages']['haproxy']['ha_backends']['item'])) {
-	$config['installedpackages']['haproxy']['ha_backends']['item'] = array();
-}
-
-$a_pools = &$config['installedpackages']['haproxy']['ha_pools']['item'];
-$a_backends = &$config['installedpackages']['haproxy']['ha_backends']['item'];
-
-if ($_POST) {
-	$pconfig = $_POST;
-
-	if ($_POST['apply']) {
-		$retval = 0;
-		config_lock();
-		$retval = haproxy_configure();
-		config_unlock();
-		$savemsg = get_std_save_message($retval);
-		unlink_if_exists($d_haproxyconfdirty_path);
-	}
-}
-
-if ($_GET['act'] == "del") {
-	if (isset($a_pools[$_GET['id']])) {
-		unset($a_pools[$_GET['id']]);
-		write_config();
-		touch($d_haproxyconfdirty_path);
-	}
-	header("Location: haproxy_pools.php");
-	exit;
-}
-
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
-	$one_two = true;
-	
-$pgtitle = "Services: HAProxy: Server pools";
-include("head.inc");
-
-?>
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<?php if($one_two): ?>
-<p class="pgtitle"><?=$pgtitle?></p>
-<?php endif; ?>
-<form action="haproxy_pools.php" method="post">
-<?php if ($input_errors) print_input_errors($input_errors); ?>
-<?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (file_exists($d_haproxyconfdirty_path)): ?><p>
-<?php print_info_box_np("The virtual pool configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
-<?php endif; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td class="tabnavtbl">
-  <?php
-        /* active tabs */
-        $tab_array = array();
-	$tab_array[] = array("Settings", false, "haproxy_global.php");
-        $tab_array[] = array("Listener", false, "haproxy_listeners.php");
-	$tab_array[] = array("Server Pool", true, "haproxy_pools.php");
-	display_top_tabs($tab_array);
-  ?>
-  </td></tr>
-  <tr>
-    <td>
-	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                  <td width="30%" class="listhdrr">Name</td>
-                  <td width="10%" class="listhdrr">Servers</td>
-                  <td width="40%" class="listhdrr">Listener</td>
-                  <td width="10%" class="list"></td>
-				</tr>
-<?php
-		 $i = 0;
-		 foreach ($a_pools as $pool):
-
-		 $fe_list = "";
-		 $sep = "";
-		 foreach ($a_backends as $backend) {
-			 if($backend['pool'] == $pool['name']) {
-				 $fe_list .= $sep . $backend['name'];
-				 $sep = ", ";
-			 }
-		 }
-		 $textss = $textse = "";
-		 if ($fe_list == "") {
-			 $textss = "<span class=\"gray\">";
-			 $textse = "</span>";
-		 }
-		 if (is_array($pool['ha_servers']['item']))
-			 $count = count($pool['ha_servers']['item']);
-		 else
-			 $count = 0;
-?>
-                <tr>
-                  <td class="listlr" ondblclick="document.location='haproxy_pool_edit.php?id=<?=$i;?>';">
-			<?=$textss . $pool['name'] . $textse;?>
-                  </td>
-                  <td class="listlr" ondblclick="document.location='haproxy_pool_edit.php?id=<?=$i;?>';">
-			<?=$textss . $count . $textse;?>
-                  </td>
-                  <td class="listlr" ondblclick="document.location='haproxy_pool_edit.php?id=<?=$i;?>';">
-			<?=$textss . $fe_list . $textse;?>
-                  </td>
-                  <td class="list" nowrap>
-                    <table border="0" cellspacing="0" cellpadding="1">
-                      <tr>
-                        <td valign="middle"><a href="haproxy_pool_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-                        <td valign="middle"><a href="haproxy_pools.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this entry?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
-                        <td valign="middle"><a href="haproxy_pool_edit.php?dup=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <?php $i++; endforeach; ?>
-                <tr>
-                  <td class="list" colspan="3"></td>
-                  <td class="list">
-                    <table border="0" cellspacing="0" cellpadding="1">
-                      <tr>
-                        <td valign="middle"><a href="haproxy_pool_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-              </table>
-	   </div>
-	</table>
-            </form>
-<?php include("fend.inc"); ?>
-</body>
-</html>