Rename cvssync to gitsync

4 files changed, 10 insertions, 5 deletions

diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc
index 60e0475..5f021bf 100644
--- a/etc/inc/functions.inc
+++ b/etc/inc/functions.inc
@@ -84,5 +84,6 @@ require_once("vpn.inc");
 require_once("vslb.inc");
 require_once("cmd_chain.inc");
 require_once("rrd.inc");
+require_once("haproxy.inc");
 
-?>
+?>
\ No newline at end of file
diff --git a/etc/inc/xmlparse.inc b/etc/inc/xmlparse.inc
index cb55117..8125256 100644
--- a/etc/inc/xmlparse.inc
+++ b/etc/inc/xmlparse.inc
@@ -47,7 +47,8 @@ function listtags() {
 		"option ppp package passthrumac phase1 phase2 priv proxyarpnet qinqentry queue ".
 		"pages pipe roll route row rrddatafile rule schedule service servernat servers ".
 		"serversdisabled earlyshellcmd shellcmd staticmap subqueue timerange ".
-		"tunnel user vip virtual_server vlan winsserver wolentry widget  "
+		"tunnel user vip virtual_server vlan winsserver wolentry widget  " .
+		"ha_frontend ha_backend ha_acl ha_server "
 		);
 	return $ret;
 }
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/gitsync
index 238f5d0..238f5d0 100644
--- a/etc/phpshellsessions/cvssync
+++ b/etc/phpshellsessions/gitsync
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 7784ec2..3d58deb 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -197,9 +197,12 @@ echo "done.\n";
 /* start load balancer daemon */
 relayd_configure();
 
-	/* reconfigure our gateway monitor */
+/* start haproxy daemon */ 
+haproxy_configure();
+
+/* reconfigure our gateway monitor */
 echo "Setting up gateway monitors...";
-	setup_gateways_monitor();
+setup_gateways_monitor();
 echo "done.\n";
 
 /* start OpenVPN server & clients */
@@ -346,4 +349,4 @@ mwexec_bg("/usr/sbin/update_dns_cache.sh");
 unlink("{$g['varrun_path']}/booting");
 $g['booting'] = FALSE;
 
-?>
+?>
\ No newline at end of file