diff options
| author | Scott Ullrich <sullrich@mpb-geekgod.geekgod.com> | 2009-06-18 20:17:10 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@mpb-geekgod.geekgod.com> | 2009-06-18 20:17:10 -0400 |
| commit | 5e7d127ad9f53dc3c2c43359fb902a6f9e389ba1 (patch) | |
| tree | 88e6a425b691dc1a07e510806317d16b72896bf6 | |
| parent | 62b035ce5f41c8342f0eea0b78e5878ff467e525 (diff) | |
| download | pfsense-5e7d127ad9f53dc3c2c43359fb902a6f9e389ba1.zip pfsense-5e7d127ad9f53dc3c2c43359fb902a6f9e389ba1.tar.gz | |
Revert "Rename cvssync to gitsync"
This reverts commit 62b035ce5f41c8342f0eea0b78e5878ff467e525.
| -rw-r--r-- | etc/inc/functions.inc | 3 | ||||
| -rw-r--r-- | etc/inc/xmlparse.inc | 3 | ||||
| -rw-r--r-- | etc/phpshellsessions/cvssync (renamed from etc/phpshellsessions/gitsync) | 0 | ||||
| -rwxr-xr-x | etc/rc.bootup | 9 | ||||
| -rwxr-xr-x | usr/local/www/fbegin.inc | 1 | ||||
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 1 |
6 files changed, 5 insertions, 12 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 +?> diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 63c741c..cd4439d 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -183,7 +183,6 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') { output_menu_item("/services_dhcp.php", "DHCP Server"); output_menu_item("/services_dyndns.php", "Dynamic DNS"); output_menu_item("/services_igmpproxy.php", "IGMP proxy"); - output_menu_item("/haproxy_global.php", "HAProxy"); output_menu_item("/load_balancer_pool.php", "Load Balancer"); output_menu_item("/pkg_edit.php?xml=olsrd.xml&id=0", "OLSR"); output_menu_item("/vpn_pppoe.php", "PPPoE Server"); diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 7ef37c1..f80c375 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -94,7 +94,6 @@ $d_vipconfdirty_path = $g['varrun_path'] . "/vip.conf.dirty"; $d_sysctldirty_path = $g['varrun_path'] . "/sysctl.conf.dirty"; $d_vsconfdirty_path = $g['varrun_path'] . "/vs.conf.dirty"; $d_shaperconfdirty_path = $g['varrun_path'] . "/shaper.conf.dirty"; -$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty"; /* OpenVPN Directories */ $d_ovpnsrvdirty_path = "/tmp/ovpn-srv.dirty"; |
