Revert "Rename cvssync to gitsync"

This reverts commit 62b035ce5f41c8342f0eea0b78e5878ff467e525.

4 files changed, 5 insertions, 10 deletions

diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc
index 5f021bf..60e0475 100644
--- a/etc/inc/functions.inc
+++ b/etc/inc/functions.inc
@@ -84,6 +84,5 @@ 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 8125256..cb55117 100644
--- a/etc/inc/xmlparse.inc
+++ b/etc/inc/xmlparse.inc
@@ -47,8 +47,7 @@ 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  " .
-		"ha_frontend ha_backend ha_acl ha_server "
+		"tunnel user vip virtual_server vlan winsserver wolentry widget  "
 		);
 	return $ret;
 }
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/cvssync
index 238f5d0..238f5d0 100644
--- a/etc/phpshellsessions/gitsync
+++ b/etc/phpshellsessions/cvssync
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 3d58deb..7784ec2 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -197,12 +197,9 @@ echo "done.\n";
 /* start load balancer daemon */
 relayd_configure();
 
-/* start haproxy daemon */ 
-haproxy_configure();
-
-/* reconfigure our gateway monitor */
+	/* reconfigure our gateway monitor */
 echo "Setting up gateway monitors...";
-setup_gateways_monitor();
+	setup_gateways_monitor();
 echo "done.\n";
 
 /* start OpenVPN server & clients */
@@ -349,4 +346,4 @@ mwexec_bg("/usr/sbin/update_dns_cache.sh");
 unlink("{$g['varrun_path']}/booting");
 $g['booting'] = FALSE;
 
-?>
\ No newline at end of file
+?>